diff options
Diffstat (limited to 'python/helpers')
| -rw-r--r-- | python/helpers/pycharm/django_test_runner.py | 1 | ||||
| -rw-r--r-- | python/helpers/pycharm/nose_utils.py | 2 | ||||
| -rw-r--r-- | python/helpers/pycharm/pycharm_run_utils.py | 3 | ||||
| -rw-r--r-- | python/helpers/pydev/pydev_monkey.py | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/python/helpers/pycharm/django_test_runner.py b/python/helpers/pycharm/django_test_runner.py index ed5fd0947a03..f3f20a0717a8 100644 --- a/python/helpers/pycharm/django_test_runner.py +++ b/python/helpers/pycharm/django_test_runner.py @@ -2,6 +2,7 @@ from tcunittest import TeamcityTestRunner, TeamcityTestResult from tcmessages import TeamcityServiceMessages import sys from pycharm_run_utils import adjust_django_sys_path + adjust_django_sys_path() from django.conf import settings diff --git a/python/helpers/pycharm/nose_utils.py b/python/helpers/pycharm/nose_utils.py index 9a6d68251cb3..a7efa08d4f4e 100644 --- a/python/helpers/pycharm/nose_utils.py +++ b/python/helpers/pycharm/nose_utils.py @@ -116,7 +116,7 @@ class TeamcityPlugin(ErrorClassPlugin, TextTestResult, TeamcityTestResult): suite = strclass(test.__class__) suite_location = "python_nosetestid://" + suite try: - from nose_helper.util import func_lineno + from nose.util import func_lineno if hasattr(test.test, "descriptor") and test.test.descriptor: suite_location = "file://" + self.test_address( diff --git a/python/helpers/pycharm/pycharm_run_utils.py b/python/helpers/pycharm/pycharm_run_utils.py index 5fbc35cc1582..d905d0542303 100644 --- a/python/helpers/pycharm/pycharm_run_utils.py +++ b/python/helpers/pycharm/pycharm_run_utils.py @@ -20,9 +20,10 @@ def adjust_sys_path(add_script_parent=True, script_index=1): insert_to_sys_path(script_path) def adjust_django_sys_path(): - sys.path.pop(0) + pycharm_path = sys.path.pop(0) script_path = sys.argv[-1] insert_to_sys_path(script_path) + sys.path.append(pycharm_path) def import_system_module(name): f, filename, desc = imp.find_module(name) diff --git a/python/helpers/pydev/pydev_monkey.py b/python/helpers/pydev/pydev_monkey.py index 8dd94ab1842d..ed6fea53ff58 100644 --- a/python/helpers/pydev/pydev_monkey.py +++ b/python/helpers/pydev/pydev_monkey.py @@ -4,7 +4,7 @@ import sys import pydev_log import traceback -helpers = os.path.dirname(__file__) +helpers = os.path.dirname(__file__).replace('\\', '/') def is_python(path): if path.endswith("'") or path.endswith('"'): |