Rope Refactoring: comparison RefactoringRope/RefactoringServer.py

-:d38295fd97c2
+:a967ff16629a
 """
 Module implementing the refactoring interface to rope.
 """
 import os
-import sys
+import contextlib
 from PyQt5.QtCore import pyqtSlot
 from PyQt5.QtWidgets import QMenu, QApplication, QAction
 from PyQt5.Qsci import QsciScintilla
 @param plugin reference to the plugin object
 @type RefactoringRopePlugin
 @param parent parent
 @type QObject
 """
-super(RefactoringServer, self).__init__(
+super().__init__(
 "RefactoringServer", parent=parent)
 self.__plugin = plugin
 self.__ui = parent
 self.__vm = e5App().getObject("ViewManager")
 @pyqtSlot()
 def handleNewConnection(self):
 """
 Public slot for new incoming connections from a client.
 """
-super(RefactoringServer, self).handleNewConnection()
+super().handleNewConnection()
 self.sendJson("GetConfig", {})
 def activate(self):
 """
 @rtype bool
 """
 if "Error" not in result:
 return True
-if "Title" in result:
+title = result.get("Title", self.tr("Rope Error"))
-title = result["Title"]
-else:
-title = self.tr("Rope Error")
 if result["Error"] == 'ModuleSyntaxError':
 res = E5MessageBox.warning(
 self.__ui, title,
 self.tr("Rope error: {0}").format(
 @param result dictionary containing the changes data
 @type dict
 """
 if self.handleRopeError(result):
 changeGroup = result["ChangeGroup"]
-try:
+with contextlib.suppress(KeyError):
 self.__refactoringDialogs[changeGroup].processChangeData(
 result)
-except KeyError:
-# ignore data for non-existing dialogs
-pass
 def __refactoringDialogClosed(self, changeGroup):
 """
 Private slot handling the closing of a refactoring dialog.
 @param changeGroup name of the refactoring change group the dialog
 belonged to
 @type str
 """
-try:
+with contextlib.suppress(KeyError):
 del self.__refactoringDialogs[changeGroup]
-except KeyError:
-# it's gone already; ignore it
-pass
 #####################################################
 ## Rename refactorings
 #####################################################
 progressDialog.show()
 progressDialog.raise_()
 self.__progressDialog = progressDialog
 QApplication.processEvents()
-elif subcommand == "Progress":
+elif subcommand == "Progress" and self.__progressDialog is not None:
-if self.__progressDialog is not None:
+self.__progressDialog.updateProgress(params)
-self.__progressDialog.updateProgress(params)
+self.__progressDialog.raise_()
-self.__progressDialog.raise_()
-elif subcommand == "Reset":
+elif subcommand == "Reset" and self.__progressDialog is not None:
-if self.__progressDialog is not None:
+self.__progressDialog.reset()
-self.__progressDialog.reset()
 def __setConfig(self, params):
 """
 Private method to set the rope client configuration data.
 if (self.__projectLanguage.startswith("Python") or
 self.__projectLanguage == "MicroPython"):
 clientEnv = os.environ.copy()
 if "PATH" in clientEnv:
+clientEnv["PATH"] = self.__ui.getOriginalPathString()
+venvManager = e5App().getObject("VirtualEnvManager")
+# get virtual environment from project first
+venvName = self.__e5project.getDebugProperty("VIRTUALENV")
+if venvName:
 try:
-clientEnv["PATH"] = self.__ui.getOriginalPathString()
+isRemote = venvManager.isRemoteEnvironment(venvName)
 except AttributeError:
-# ignore for eric6 < 18.12
+isRemote = False
-pass
+else:
-try:
+isRemote = False
-# new code using virtual environments
+if (not venvName) or isRemote:
-venvManager = e5App().getObject("VirtualEnvManager")
+# get it from debugger settings next
+if self.__projectLanguage in ("Python3", "MicroPython"):
+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 venvName:
+if "PATH" in clientEnv:
-try:
+clientEnv["PATH"] = os.pathsep.join(
-isRemote = venvManager.isRemoteEnvironment(venvName)
+[execPath, clientEnv["PATH"]])
-except AttributeError:
-isRemote = False
-else:
-isRemote = False
-if (not venvName) or isRemote:
-# get it from debugger settings next
-if self.__projectLanguage in ("Python3", "MicroPython"):
-# 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:
+else:
-interpreter = venvManager.getVirtualenvInterpreter(
+interpreter = ""
-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
-else:
-interpreter = ""
-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 self.__projectLanguage in ("Python3", "MicroPython"):
-interpreter = Preferences.getDebugger(
-"Python3Interpreter")
-else:
-interpreter = ""
 if interpreter:
 if isRemote:
 self.__ui.appendToStderr(self.tr(
 "The project is configured for remote access."
 " Using local interpreter instead."

Mercurial Repositories > Rope Refactoring / file comparison

comparison: RefactoringRope/RefactoringServer.py

RefactoringRope/RefactoringServer.py