Rope Refactoring: comparison RefactoringRope/Refactoring.py

-:6fc202183b3b
+:3c8e875d0326
 else:
 path = os.path.join(os.path.dirname(__file__), 'rope_py2')
 str = unicode   # __IGNORE_WARNING__
 sys.path.insert(0, path)
-import rope
 import rope.base.libutils
 import rope.base.exceptions
 from PyQt5.QtWidgets import QMenu, QApplication, QDialog, QAction
 from PyQt5.Qsci import QsciScintilla
 self.__helpDialog = None
 self.__progressDialog = None
 from FileSystemCommands import E5FileSystemCommands
 self.__fsCommands = E5FileSystemCommands(self.__e5project)
+self.__methodMapping = {
+"Config": self.__setConfig,
+"Progress": self.__processProgress,
+"QueryReferencesResult": self.__queryReferencesResult,
+"QueryDefinitionResult": self.__queryDefinitionResult,
+"QueryImplementationsResult": self.__queryImplementationsResult,
+"SoaFinished": self.__soaFinished,
+"FileSystemCommand": self.__fsCommands.processFileSystemCommand,
+"ClientException": self.__processClientException,
+}
 def initActions(self):
 """
 Public method to define the refactoring actions.
 """
 self.__editConfig)
 self.refactoringEditConfigAct.setMenuRole(QAction.NoRole)
 self.actions.append(self.refactoringEditConfigAct)
 self.refactoringHelpAct = E5Action(
-self.tr('Rope help'),
+self.tr('Rope Help'),
 self.tr('Rope &Help'),
 0, 0,
 self, 'refactoring_help')
 self.refactoringHelpAct.setStatusTip(self.tr(
 'Show help about the rope refactorings'))
 menu.addSeparator()
 menu.addAction(self.refactoringEditConfigAct)
 menu.addAction(self.refactoringHelpAct)
 self.__mainMenu = menu
 return menu
 ##################################################################
 ## slots below implement general functionality
 ##################################################################
 def __ropeInfo(self):
 """
 Private slot to show some info about rope.
 """
-E5MessageBox.about(
+if self.__ropeConfig:
-self.__ui,
+E5MessageBox.about(
-self.tr("About rope"),
+self.__ui,
-self.tr("{0}\nVersion {1}\n\n{2}".format(
+self.tr("About rope"),
-rope.INFO, rope.VERSION, rope.COPYRIGHT)))
+self.tr("{0}\nVersion {1}\n\n{2}".format(
+self.__ropeConfig["RopeInfo"],
+self.__ropeConfig["RopeVersion"],
+self.__ropeConfig["RopeCopyright"])))
 def __canUndo(self):
 """
 Private slot to check, if there are changes to be undone.
 ##################################################################
 ## methods below are private utility methods
 ##################################################################
+def __processProgress(self, params):
+"""
+Private method to handle Progress commands.
+@param params dictionary containing the progress data
+@type dict
+"""
+subcommand = params["Subcommand"]
+if subcommand == "Init":
+if self.__progressDialog is not None:
+self.__progressDialog.reset()
+progressDialog = RopeProgressDialog(
+self, params["Title"], params["Interruptable"], self.__ui)
+progressDialog.show()
+self.__progressDialog = progressDialog
+QApplication.processEvents()
+elif subcommand == "Progress":
+if self.__progressDialog is not None:
+self.__progressDialog.updateProgress(params)
+elif subcommand == "Reset":
+if self.__progressDialog is not None:
+self.__progressDialog.reset()
+def __setConfig(self, params):
+"""
+Private method to set the rope client configuration data.
+@param params dictionary containing the configuration data
+@type dict
+"""
+self.__ropeConfig = params
+# keys: RopeFolderName, DefaultConfig, RopeHelpFile,
+# RopeInfo, RopeVersion, RopeCopyright
 def __ropeConfigFile(self):
 """
 Private method to get the name of the rope configuration file.
 @return name of the rope configuration file (string)
 self.__projectopen = True
 self.__projectpath = self.__e5project.getProjectPath()
 self.__projectLanguage = self.__e5project.getProjectLanguage()
+ok = False
 if self.__projectLanguage.startswith("Python"):
-if self.__projectLanguage == "Python2":
+# get interpreter from project first
-interpreter = Preferences.getDebugger("PythonInterpreter")
+interpreter = self.__e5project.getDebugProperty("INTERPRETER")
-elif self.__projectLanguage == "Python3":
+if not interpreter or not Utilities.isinpath(interpreter):
-interpreter = Preferences.getDebugger("Python3Interpreter")
+# get it from debugger settings second
-else:
+if self.__projectLanguage == "Python2":
-interpreter = ""
+interpreter = Preferences.getDebugger("PythonInterpreter")
+elif self.__projectLanguage == "Python3":
+interpreter = Preferences.getDebugger("Python3Interpreter")
+else:
+interpreter = ""
 if interpreter:
 ok = self.__startRefactoringClient(interpreter)
 if not ok:
 self.__ui.appendToStderr(self.tr(
 "Project language '{0}' is not supported because"
 self.__ui.appendToStderr(self.tr(
 "Project language '{0}' is not supported because no"
 " suitable interpreter is configured. Refactoring is"
 " disabled."
 ).format(self.__projectLanguage))
+else:
+self.__ui.appendToStderr(self.tr(
+"Refactoring for project language '{0}' is not supported."
+).format(self.__projectLanguage))
+self.__mainMenu.menuAction().setEnabled(ok)
 def projectClosed(self):
 """
 Public slot to handle the projectClosed signal.
 """
 for act in self.actions:
 act.setEnabled(False)
+self.__mainMenu.menuAction().setEnabled(False)
 self.stopClient()
 self.__projectopen = False
 self.__projectpath = ''
 @param method requested method name
 @type str
 @param params dictionary with method specific parameters
 @type dict
 """
-if method == "Config":
+self.__methodMapping[method](params)
-self.__ropeConfig = params
-# keys: RopeFolderName, DefaultConfig
+def __processClientException(self, params):
+"""
-elif method == "ClientException":
+Private method to handle exceptions of the refactoring client.
-if params["ExceptionType"] == "ProtocolError":
-E5MessageBox.critical(
+@param params dictionary containing the exception data
-None,
+@type dict
-self.tr("Refactoring Protocol Error"),
+"""
-self.tr("""<p>The data received from the refactoring"""
+if params["ExceptionType"] == "ProtocolError":
-""" server could not be decoded. Please report"""
+E5MessageBox.critical(
-""" this issue with the received data to the"""
+None,
-""" eric bugs email address.</p>"""
+self.tr("Refactoring Protocol Error"),
-"""<p>Error: {0}</p>"""
+self.tr("""<p>The data received from the refactoring"""
-"""<p>Data:<br/>{0}</p>""").format(
+""" server could not be decoded. Please report"""
-params["ExceptionValue"],
+""" this issue with the received data to the"""
-Utilities.html_encode(params["ProtocolData"])),
+""" eric bugs email address.</p>"""
-E5MessageBox.StandardButtons(
+"""<p>Error: {0}</p>"""
-E5MessageBox.Ok))
+"""<p>Data:<br/>{0}</p>""").format(
-else:
+params["ExceptionValue"],
-E5MessageBox.critical(
+Utilities.html_encode(params["ProtocolData"])),
-None,
+E5MessageBox.StandardButtons(
-self.tr("Refactoring Client Error"),
+E5MessageBox.Ok))
-self.tr("<p>An exception happened in the refactoring"
+else:
-" client. Please report it to the eric bugs"
+E5MessageBox.critical(
-" email address.</p>"
+None,
-"<p>Exception: {0}</p>"
+self.tr("Refactoring Client Error"),
-"<p>Value: {1}</p>"
+self.tr("<p>An exception happened in the refactoring"
-"Traceback: {2}</p>").format(
+" client. Please report it to the eric bugs"
-Utilities.html_encode(params["ExceptionType"]),
+" email address.</p>"
-params["ExceptionValue"],
+"<p>Exception: {0}</p>"
-params["Traceback"].replace("\r\n", "<br/>")
+"<p>Value: {1}</p>"
-.replace("\n", "<br/>").replace("\r", "<br/>"),
+"Traceback: {2}</p>").format(
-),
+Utilities.html_encode(params["ExceptionType"]),
-E5MessageBox.StandardButtons(
+params["ExceptionValue"],
-E5MessageBox.Ok))
+params["Traceback"].replace("\r\n", "<br/>")
+.replace("\n", "<br/>").replace("\r", "<br/>"),
-elif method == "FileSystemCommand":
+),
-self.__fsCommands.processFileSystemCommand(params)
+E5MessageBox.StandardButtons(
+E5MessageBox.Ok))
-elif method == "ProgressInit":
-progressDialog = RopeProgressDialog(
-self, params["Title"], params["Interrutable"], self.__ui)
-progressDialog.show()
-self.__progressDialog = progressDialog
-QApplication.processEvents()
-elif method == "Progress":
-if self.__progressDialog is not None:
-self.__progressDialog.updateProgress(params)
-elif method == "ProgressReset":
-if self.__progressDialog is not None:
-self.__progressDialog.reset()
-elif method == "QueryReferencesResult":
-self.__queryReferencesResult(params)
-elif method == "QueryDefinitionResult":
-self.__queryDefinitionResult(params)
-elif method == "QueryImplementationsResult":
-self.__queryImplementationsResult(params)
-elif method == "SoaFinished":
-self.__soaFinished(params)
 def __startRefactoringClient(self, interpreter):
 """
 Private method to start the refactoring client.

Mercurial Repositories > Rope Refactoring / file comparison

comparison: RefactoringRope/Refactoring.py

RefactoringRope/Refactoring.py