--- a/RefactoringRope/CodeAssistServer.py Sat May 02 15:05:16 2020 +0200
+++ b/RefactoringRope/CodeAssistServer.py Mon Jun 22 18:08:10 2020 +0200
@@ -99,9 +99,6 @@
"<unknown>": self.tr("not known"),
}
- # Python 2
- self.__ensureActive("Python2")
-
# Python 3
self.__ensureActive("Python3")
@@ -120,13 +117,7 @@
"""
self.__editorLanguageMapping = {}
for name in self.connectionNames():
- if name == "Python2":
- self.__editorLanguageMapping.update({
- "Python": "Python2",
- "Python2": "Python2",
- "Pygments|Python": "Python2",
- })
- elif name == "Python3":
+ if name == "Python3":
self.__editorLanguageMapping.update({
"Python3": "Python3",
"Pygments|Python 3": "Python3",
@@ -670,64 +661,26 @@
venvName = ""
clientEnv = os.environ.copy()
if "PATH" in clientEnv:
- try:
- clientEnv["PATH"] = self.__ui.getOriginalPathString()
- except AttributeError:
- # ignore for eric6 < 18.12
- pass
- try:
- # new code using virtual environments
- venvManager = e5App().getObject("VirtualEnvManager")
- if idString == "Python2":
- # Python 2
- venvName = Preferences.getDebugger("Python2VirtualEnv")
- if not venvName and sys.version_info[0] == 2:
- try:
- venvName, _ = (
- venvManager.getDefaultEnvironment()
- )
- except AttributeError:
- # ignore for eric6 < 18.10
- pass
- elif idString == "Python3":
- # Python 3
- venvName = Preferences.getDebugger("Python3VirtualEnv")
- if not venvName and sys.version_info[0] >= 3:
- try:
- venvName, _ = (
- venvManager.getDefaultEnvironment()
- )
- except AttributeError:
- # ignore for eric6 < 18.10
- pass
- if venvName:
- interpreter = venvManager.getVirtualenvInterpreter(
- venvName)
-
- try:
- execPath = venvManager.getVirtualenvExecPath(
- venvName)
- except AttributeError:
- # eric6 < 18.12
- execPath = ""
-
- # build a suitable environment
- if execPath:
- if "PATH" in clientEnv:
- clientEnv["PATH"] = os.pathsep.join(
- [execPath, clientEnv["PATH"]])
- else:
- clientEnv["PATH"] = execPath
- except KeyError:
- # backward compatibility (eric <18.07)
- if idString == "Python2":
- # Python 2
- interpreter = Preferences.getDebugger(
- "PythonInterpreter")
- elif idString == "Python3":
- # Python 3
- interpreter = Preferences.getDebugger(
- "Python3Interpreter")
+ clientEnv["PATH"] = self.__ui.getOriginalPathString()
+ venvManager = e5App().getObject("VirtualEnvManager")
+ if idString == "Python3":
+ # Python 3
+ venvName = Preferences.getDebugger("Python3VirtualEnv")
+ if not venvName and sys.version_info[0] >= 3:
+ venvName, _ = venvManager.getDefaultEnvironment()
+ if venvName:
+ interpreter = venvManager.getVirtualenvInterpreter(
+ venvName)
+
+ execPath = venvManager.getVirtualenvExecPath(venvName)
+
+ # build a suitable environment
+ if execPath:
+ if "PATH" in clientEnv:
+ clientEnv["PATH"] = os.pathsep.join(
+ [execPath, clientEnv["PATH"]])
+ else:
+ clientEnv["PATH"] = execPath
if interpreter:
ok = self.__startCodeAssistClient(interpreter, idString,
clientEnv)
@@ -763,18 +716,7 @@
venvName = self.__e5project.getDebugProperty("VIRTUALENV")
if not venvName:
# get it from debugger settings next
- if projectLanguage == "Python2":
- # Python 2
- venvName = Preferences.getDebugger("Python2VirtualEnv")
- if not venvName and sys.version_info[0] == 2:
- try:
- venvName, _ = (
- venvManager.getDefaultEnvironment()
- )
- except AttributeError:
- # ignore for eric6 < 18.10
- pass
- elif projectLanguage == "Python3":
+ if projectLanguage == "Python3":
# Python 3
venvName = Preferences.getDebugger("Python3VirtualEnv")
if not venvName and sys.version_info[0] >= 3:
@@ -811,10 +753,7 @@
interpreter = self.__e5project.getDebugProperty("INTERPRETER")
if not interpreter or not Utilities.isinpath(interpreter):
# get it from debugger settings second
- if projectLanguage == "Python2":
- interpreter = Preferences.getDebugger(
- "PythonInterpreter")
- elif projectLanguage == "Python3":
+ if projectLanguage == "Python3":
interpreter = Preferences.getDebugger(
"Python3Interpreter")
