MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

A small refactoring after review (PY-15265, PY-6396)

Browse Source
This commit is contained in:
Elizaveta Shashkova
2015-03-24 16:02:17 +03:00
parent 949865270b
commit 25f443ed84
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/helpers/pydev/pydevd.py
+5 -10
View File
@@ -380,13 +380,13 @@ class PyDB:
return self.plugin
def get_project_roots(self):
roots = os.getenv('PYCHARM_PROJECT_ROOTS', '').split(os.pathsep)
pydev_log.debug("PYCHARM_PROJECT_ROOTS %s\n" % roots)
return roots
if self.project_roots is None:
roots = os.getenv('IDE_PROJECT_ROOTS', '').split(os.pathsep)
pydev_log.debug("IDE_PROJECT_ROOTS %s\n" % roots)
self.project_roots = roots
def not_in_scope(self, filename):
if self.project_roots is None:
return False
self.get_project_roots()
filename = os.path.normcase(filename)
for root in self.project_roots:
root = os.path.normcase(root)
@@ -1140,9 +1140,6 @@ class PyDB:
else:
exception, notify_always, notify_on_terminate, ignore_libraries = text, 0, 0, 0
if int(ignore_libraries) > 0 and self.project_roots is None:
self.project_roots = self.get_project_roots()
if exception.find('-') != -1:
type, exception = exception.split('-')
else:
@@ -1545,8 +1542,6 @@ class PyDB:
#print('trace_dispatch', base, frame.f_lineno, event, frame.f_code.co_name, is_file_to_ignore)
if is_file_to_ignore:
if DONT_TRACE[base] == LIB_FILE:
if self.project_roots is None:
self.project_roots = self.get_project_roots()
if self.not_in_scope(filename):
return None
else:
python/helpers/pydev/pydevd_signature.py
+1 -1
View File
@@ -31,7 +31,7 @@ class Signature(object):
class SignatureFactory(object):
def __init__(self):
self._caller_cache = {}
self.project_roots = os.getenv('PYCHARM_PROJECT_ROOTS', '').split(os.pathsep)
self.project_roots = os.getenv('IDE_PROJECT_ROOTS', '').split(os.pathsep)
def is_in_scope(self, filename):
filename = os.path.normcase(filename)
python/src/com/jetbrains/python/debugger/PyDebugRunner.java
+2 -2
View File
@@ -63,7 +63,7 @@ public class PyDebugRunner extends GenericProgramRunner {
public static final String CLIENT_PARAM = "--client";
public static final String PORT_PARAM = "--port";
public static final String FILE_PARAM = "--file";
public static final String PYCHARM_PROJECT_ROOTS = "PYCHARM_PROJECT_ROOTS";
public static final String IDE_PROJECT_ROOTS = "IDE_PROJECT_ROOTS";
@SuppressWarnings("SpellCheckingInspection")
public static final String GEVENT_SUPPORT = "GEVENT_SUPPORT";
@@ -249,6 +249,6 @@ public class PyDebugRunner extends GenericProgramRunner {
roots.add(contentRoot.getPath());
}
commandLine.getEnvironment().put(PYCHARM_PROJECT_ROOTS, StringUtil.join(roots, File.pathSeparator));
commandLine.getEnvironment().put(IDE_PROJECT_ROOTS, StringUtil.join(roots, File.pathSeparator));
}
}