Rope Refactoring: comparison RefactoringRope/CodeAssistServer.py

-:d38295fd97c2
+:a967ff16629a
 Module implementing the autocompletion interface to rope.
 """
 import os
 import sys
+import contextlib
 from PyQt5.QtCore import pyqtSlot, QCoreApplication, QTimer
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
 from .JsonServer import JsonServer
 import Globals
 import Preferences
-import Utilities
 class CodeAssistServer(JsonServer):
 """
 Class implementing the autocompletion interface to rope.
 @param plugin reference to the plugin object
 @type RefactoringRopePlugin
 @param parent parent
 @type QObject
 """
-super(CodeAssistServer, self).__init__(
+super().__init__(
 "CodeAssistServer", multiplex=True, parent=parent)
 self.__plugin = plugin
 self.__ui = parent
 self.__vm = e5App().getObject("ViewManager")
 """
 if "Error" not in result:
 # ignore errors silently
 if "Location" in result:
 location = result["Location"]
-try:
+self.__vm.openSourceFile(location["ModulePath"],
-self.__vm.openSourceFile(
+location["Line"],
-location["ModulePath"], location["Line"], addNext=True)
+addNext=True)
-except TypeError:
-# backward compatibility; <= 17.03
-self.__vm.openSourceFile(
-location["ModulePath"], location["Line"], next=True)
 else:
 e5App().getObject("UserInterface").statusBar().showMessage(
 self.tr('Code Assist: No definition found'), 5000)
 #######################################################################
 clientEnv = os.environ.copy()
 if "PATH" in clientEnv:
 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:
+if not venvName:
 venvName, _ = venvManager.getDefaultEnvironment()
 if venvName:
 interpreter = venvManager.getVirtualenvInterpreter(
 venvName)
 """
 projectLanguage = self.__e5project.getProjectLanguage()
 interpreter = ""
 clientEnv = os.environ.copy()
 if "PATH" in clientEnv:
-try:
+clientEnv["PATH"] = self.__ui.getOriginalPathString()
-clientEnv["PATH"] = self.__ui.getOriginalPathString()
-except AttributeError:
-# ignore for eric6 < 18.12
-pass
 if projectLanguage.startswith("Python"):
-try:
+venvManager = e5App().getObject("VirtualEnvManager")
-# new code using virtual environments
-venvManager = e5App().getObject("VirtualEnvManager")
+# get virtual environment from project first
+venvName = self.__e5project.getDebugProperty("VIRTUALENV")
+if not venvName:
+# get it from debugger settings next
+if projectLanguage == "Python3":
+venvName = Preferences.getDebugger("Python3VirtualEnv")
+if not venvName:
+venvName, _ = venvManager.getDefaultEnvironment()
+else:
+venvName = ""
+if venvName:
+interpreter = venvManager.getVirtualenvInterpreter(
+venvName
+)
+execPath = venvManager.getVirtualenvExecPath(venvName)
-# get virtual environment from project first
+# build a suitable environment
-venvName = self.__e5project.getDebugProperty("VIRTUALENV")
+if execPath:
-if not venvName:
+if "PATH" in clientEnv:
-# get it from debugger settings next
+clientEnv["PATH"] = os.pathsep.join(
-if projectLanguage == "Python3":
+[execPath, clientEnv["PATH"]])
-# 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
 else:
-venvName = ""
+clientEnv["PATH"] = execPath
-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)
-# get interpreter from project first
-interpreter = self.__e5project.getDebugProperty("INTERPRETER")
-if not interpreter or not Utilities.isinpath(interpreter):
-# get it from debugger settings second
-if projectLanguage == "Python3":
-interpreter = Preferences.getDebugger(
-"Python3Interpreter")
 return interpreter, clientEnv
 @pyqtSlot()
 def handleNewConnection(self):
 """
 Public slot for new incoming connections from a client.
 """
-super(CodeAssistServer, self).handleNewConnection()
+super().handleNewConnection()
 self.__updateEditorLanguageMapping()
 self.__getConfigs()
 def activate(self):
 """
 Public method to activate the code assist server.
 """
-try:
+self.__documentationViewer = self.__ui.documentationViewer()
-self.__documentationViewer = self.__ui.documentationViewer()
+if self.__documentationViewer is not None:
-if self.__documentationViewer is not None:
+self.__documentationViewer.registerProvider(
-self.__documentationViewer.registerProvider(
+"rope", self.tr("Rope"), self.requestCodeDocumentation,
-"rope", self.tr("Rope"), self.requestCodeDocumentation,
+self.isSupportedLanguage)
-self.isSupportedLanguage)
-except AttributeError:
-# eric6 before 17.11 doesn't have this
-pass
 self.__e5project.projectClosed.connect(self.__projectClosed)
 def deactivate(self):
 """
 self.__documentationViewer.unregisterProvider("rope")
 for idString in self.connectionNames():
 self.sendJson("closeProject", {}, flush=True, idString=idString)
-try:
+with contextlib.suppress(TypeError):
 self.__e5project.projectClosed.disconnect(self.__projectClosed)
-except TypeError:
-# ignore it, the signal may be disconnected already
-pass
 self.stopAllClients()
 @pyqtSlot()
 def __projectClosed(self):

Mercurial Repositories > Rope Refactoring / file comparison

comparison: RefactoringRope/CodeAssistServer.py

RefactoringRope/CodeAssistServer.py