Mercurial Repositories > Rope Refactoring / file comparison
comparison: RefactoringRope/RefactoringServer.py
RefactoringRope/RefactoringServer.py
- changeset 320
- 91b171fdd85f
- parent 315
- 7e173652a1f9
- child 325
- 9b08802a8e1a
equal
deleted
inserted
replaced
| 319:1d71264692ef | 320:91b171fdd85f |
|---|---|
| 931 @type dict | 931 @type dict |
| 932 """ | 932 """ |
| 933 if self.handleRopeError(result): | 933 if self.handleRopeError(result): |
| 934 changeGroup = result["ChangeGroup"] | 934 changeGroup = result["ChangeGroup"] |
| 935 try: | 935 try: |
| 936 self.__refactoringDialogs[changeGroup]\ | 936 self.__refactoringDialogs[changeGroup].processChangeData( |
| 937 .processChangeData(result) | 937 result) |
| 938 except KeyError: | 938 except KeyError: |
| 939 # ignore data for non-existing dialogs | 939 # ignore data for non-existing dialogs |
| 940 pass | 940 pass |
| 941 | 941 |
| 942 def __refactoringDialogClosed(self, changeGroup): | 942 def __refactoringDialogClosed(self, changeGroup): |
| 1895 """ | 1895 """ |
| 1896 Private slot to show help about the refactorings offered by Rope. | 1896 Private slot to show help about the refactorings offered by Rope. |
| 1897 """ | 1897 """ |
| 1898 if self.__helpDialog is None: | 1898 if self.__helpDialog is None: |
| 1899 from .HelpDialog import HelpDialog | 1899 from .HelpDialog import HelpDialog |
| 1900 self.__helpDialog = \ | 1900 self.__helpDialog = HelpDialog( |
| 1901 HelpDialog(self.tr("Help about rope refactorings"), | 1901 self.tr("Help about rope refactorings"), |
| 1902 self.__ropeConfig["RopeHelpFile"]) | 1902 self.__ropeConfig["RopeHelpFile"] |
| 1903 ) | |
| 1903 self.__helpDialog.show() | 1904 self.__helpDialog.show() |
| 1904 | 1905 |
| 1905 def __performSOA(self): | 1906 def __performSOA(self): |
| 1906 """ | 1907 """ |
| 1907 Private slot to perform SOA on all modules. | 1908 Private slot to perform SOA on all modules. |
| 2066 if self.__projectLanguage == "Python2": | 2067 if self.__projectLanguage == "Python2": |
| 2067 # Python 2 | 2068 # Python 2 |
| 2068 venvName = Preferences.getDebugger("Python2VirtualEnv") | 2069 venvName = Preferences.getDebugger("Python2VirtualEnv") |
| 2069 if not venvName and sys.version_info[0] == 2: | 2070 if not venvName and sys.version_info[0] == 2: |
| 2070 try: | 2071 try: |
| 2071 venvName, _ = \ | 2072 venvName, _ = ( |
| 2072 venvManager.getDefaultEnvironment() | 2073 venvManager.getDefaultEnvironment() |
| 2074 ) | |
| 2073 except AttributeError: | 2075 except AttributeError: |
| 2074 # ignore for eric6 < 18.10 | 2076 # ignore for eric6 < 18.10 |
| 2075 pass | 2077 pass |
| 2076 elif self.__projectLanguage in ("Python3", "MicroPython"): | 2078 elif self.__projectLanguage in ("Python3", "MicroPython"): |
| 2077 # Python 3 | 2079 # Python 3 |
| 2078 venvName = Preferences.getDebugger("Python3VirtualEnv") | 2080 venvName = Preferences.getDebugger("Python3VirtualEnv") |
| 2079 if not venvName and sys.version_info[0] == 3: | 2081 if not venvName and sys.version_info[0] >= 3: |
| 2080 try: | 2082 try: |
| 2081 venvName, _ = \ | 2083 venvName, _ = ( |
| 2082 venvManager.getDefaultEnvironment() | 2084 venvManager.getDefaultEnvironment() |
| 2085 ) | |
| 2083 except AttributeError: | 2086 except AttributeError: |
| 2084 # ignore for eric6 < 18.10 | 2087 # ignore for eric6 < 18.10 |
| 2085 pass | 2088 pass |
| 2086 else: | 2089 else: |
| 2087 venvName = "" | 2090 venvName = "" |
| 2088 if venvName: | 2091 if venvName: |
| 2089 interpreter = \ | 2092 interpreter = venvManager.getVirtualenvInterpreter( |
| 2090 venvManager.getVirtualenvInterpreter(venvName) | 2093 venvName) |
| 2091 | 2094 |
| 2092 try: | 2095 try: |
| 2093 execPath = venvManager.getVirtualenvExecPath(venvName) | 2096 execPath = venvManager.getVirtualenvExecPath(venvName) |
| 2094 except AttributeError: | 2097 except AttributeError: |
| 2095 # eric6 < 18.12 | 2098 # eric6 < 18.12 |
| 2229 @param filename file name of the changed source | 2232 @param filename file name of the changed source |
| 2230 @type str | 2233 @type str |
| 2231 @param oldSource source code before the change | 2234 @param oldSource source code before the change |
| 2232 @type str | 2235 @type str |
| 2233 """ | 2236 """ |
| 2234 if self.__e5project.isOpen() and \ | 2237 if ( |
| 2235 self.__e5project.isProjectFile(filename): | 2238 self.__e5project.isOpen() and |
| 2239 self.__e5project.isProjectFile(filename) | |
| 2240 ): | |
| 2236 editor = self.__vm.getOpenEditor(filename) | 2241 editor = self.__vm.getOpenEditor(filename) |
| 2237 if self.__ropeConfig and \ | 2242 if ( |
| 2238 editor is not None and \ | 2243 self.__ropeConfig and |
| 2239 editor.getLanguage() == self.__ropeConfig["PythonVersion"]: | 2244 editor is not None and |
| 2245 editor.getLanguage() == self.__ropeConfig["PythonVersion"] | |
| 2246 ): | |
| 2240 self.sendJson("ReportChanged", { | 2247 self.sendJson("ReportChanged", { |
| 2241 "FileName": filename, | 2248 "FileName": filename, |
| 2242 "OldSource": oldSource, | 2249 "OldSource": oldSource, |
| 2243 }) | 2250 }) |
| 2244 | 2251 |
