diff -r 1d71264692ef -r 91b171fdd85f RefactoringRope/CodeAssistServer.py
--- a/RefactoringRope/CodeAssistServer.py Fri Oct 11 18:42:45 2019 +0200
+++ b/RefactoringRope/CodeAssistServer.py Fri Oct 11 19:05:23 2019 +0200
@@ -156,8 +156,10 @@
idString = ""
language = editor.getLanguage()
- if self.__e5project.isOpen() and \
- self.__e5project.getProjectLanguage() == language:
+ if (
+ self.__e5project.isOpen() and
+ self.__e5project.getProjectLanguage() == language
+ ):
filename = editor.getFileName()
if self.__e5project.isProjectSource(filename):
idString = CodeAssistServer.IdProject
@@ -431,11 +433,13 @@
if not idString:
language = editor.getLanguage()
if Preferences.getDocuViewer("ShowInfoAsRichText"):
- warning = self.tr("Language <b>{0}</b> is not supported.")\
- .format(language)
+ warning = self.tr(
+ "Language <b>{0}</b> is not supported."
+ ).format(language)
else:
- warning = self.tr("Language '{0}' is not supported.")\
- .format(language)
+ warning = self.tr(
+ "Language '{0}' is not supported."
+ ).format(language)
self.__documentationViewer.documentationReady(
warning, isWarning=True)
return
@@ -477,21 +481,21 @@
if "module" in documentationDict:
if documentationDict["module"]:
if Preferences.getDocuViewer("ShowInfoAsRichText"):
- documentationDict["note"] = \
- self.tr("Present in <i>{0}</i> module")\
- .format(documentationDict["module"])
+ documentationDict["note"] = self.tr(
+ "Present in <i>{0}</i> module"
+ ).format(documentationDict["module"])
else:
- documentationDict["note"] = \
- self.tr("Present in '{0}' module")\
- .format(documentationDict["module"])
+ documentationDict["note"] = self.tr(
+ "Present in '{0}' module"
+ ).format(documentationDict["module"])
del documentationDict["module"]
if "typ" in documentationDict:
if documentationDict["typ"] not in self.__typeMapping:
del documentationDict["typ"]
else:
- documentationDict["typ"] = \
- self.__typeMapping[documentationDict["typ"]]
+ documentationDict["typ"] = self.__typeMapping[
+ documentationDict["typ"]]
if "note" not in documentationDict:
documentationDict["note"] = ""
@@ -679,28 +683,30 @@
venvName = Preferences.getDebugger("Python2VirtualEnv")
if not venvName and sys.version_info[0] == 2:
try:
- venvName, _ = \
+ 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:
+ if not venvName and sys.version_info[0] >= 3:
try:
- venvName, _ = \
+ venvName, _ = (
venvManager.getDefaultEnvironment()
+ )
except AttributeError:
# ignore for eric6 < 18.10
pass
if venvName:
- interpreter = \
- venvManager.getVirtualenvInterpreter(venvName)
+ interpreter = venvManager.getVirtualenvInterpreter(
+ venvName)
try:
- execPath = \
- venvManager.getVirtualenvExecPath(venvName)
+ execPath = venvManager.getVirtualenvExecPath(
+ venvName)
except AttributeError:
# eric6 < 18.12
execPath = ""
@@ -716,12 +722,12 @@
# backward compatibility (eric <18.07)
if idString == "Python2":
# Python 2
- interpreter = \
- Preferences.getDebugger("PythonInterpreter")
+ interpreter = Preferences.getDebugger(
+ "PythonInterpreter")
elif idString == "Python3":
# Python 3
- interpreter = \
- Preferences.getDebugger("Python3Interpreter")
+ interpreter = Preferences.getDebugger(
+ "Python3Interpreter")
if interpreter:
ok = self.__startCodeAssistClient(interpreter, idString,
clientEnv)
@@ -762,26 +768,29 @@
venvName = Preferences.getDebugger("Python2VirtualEnv")
if not venvName and sys.version_info[0] == 2:
try:
- venvName, _ = \
+ venvName, _ = (
venvManager.getDefaultEnvironment()
+ )
except AttributeError:
# ignore for eric6 < 18.10
pass
elif projectLanguage == "Python3":
# Python 3
venvName = Preferences.getDebugger("Python3VirtualEnv")
- if not venvName and sys.version_info[0] == 3:
+ if not venvName and sys.version_info[0] >= 3:
try:
- venvName, _ = \
+ venvName, _ = (
venvManager.getDefaultEnvironment()
+ )
except AttributeError:
# ignore for eric6 < 18.10
pass
else:
venvName = ""
if venvName:
- interpreter = \
- venvManager.getVirtualenvInterpreter(venvName)
+ interpreter = venvManager.getVirtualenvInterpreter(
+ venvName
+ )
try:
execPath = venvManager.getVirtualenvExecPath(venvName)
