Mercurial Repositories > Rope Refactoring / file comparison
comparison: RefactoringRope/RefactoringServer.py
RefactoringRope/RefactoringServer.py
- changeset 335
- 9438c2ed7732
- parent 326
- 67bcde9c65b9
- child 341
- c43844eb47b7
equal
deleted
inserted
replaced
| 334:fe30dc24c9e5 | 335:9438c2ed7732 |
|---|---|
| 1094 @param title title of the refactoring | 1094 @param title title of the refactoring |
| 1095 @type str | 1095 @type str |
| 1096 @param kind kind of extraction to be done | 1096 @param kind kind of extraction to be done |
| 1097 @type str ("method" or "variable") | 1097 @type str ("method" or "variable") |
| 1098 """ | 1098 """ |
| 1099 assert kind in ["variable", "method"] | |
| 1100 | |
| 1101 aw = self.__vm.activeWindow() | 1099 aw = self.__vm.activeWindow() |
| 1102 | 1100 |
| 1103 if aw is None: | 1101 if aw is None: |
| 1104 return | 1102 return |
| 1105 | 1103 |
| 2064 isRemote = False | 2062 isRemote = False |
| 2065 else: | 2063 else: |
| 2066 isRemote = False | 2064 isRemote = False |
| 2067 if (not venvName) or isRemote: | 2065 if (not venvName) or isRemote: |
| 2068 # get it from debugger settings next | 2066 # get it from debugger settings next |
| 2069 if self.__projectLanguage == "Python2": | 2067 if self.__projectLanguage in ("Python3", "MicroPython"): |
| 2070 # Python 2 | |
| 2071 venvName = Preferences.getDebugger("Python2VirtualEnv") | |
| 2072 if not venvName and sys.version_info[0] == 2: | |
| 2073 try: | |
| 2074 venvName, _ = ( | |
| 2075 venvManager.getDefaultEnvironment() | |
| 2076 ) | |
| 2077 except AttributeError: | |
| 2078 # ignore for eric6 < 18.10 | |
| 2079 pass | |
| 2080 elif self.__projectLanguage in ("Python3", "MicroPython"): | |
| 2081 # Python 3 | 2068 # Python 3 |
| 2082 venvName = Preferences.getDebugger("Python3VirtualEnv") | 2069 venvName = Preferences.getDebugger("Python3VirtualEnv") |
| 2083 if not venvName and sys.version_info[0] >= 3: | 2070 if not venvName and sys.version_info[0] >= 3: |
| 2084 try: | 2071 try: |
| 2085 venvName, _ = ( | 2072 venvName, _ = ( |
| 2113 # backward compatibility (eric < 18.07) | 2100 # backward compatibility (eric < 18.07) |
| 2114 # get interpreter from project first | 2101 # get interpreter from project first |
| 2115 interpreter = self.__e5project.getDebugProperty("INTERPRETER") | 2102 interpreter = self.__e5project.getDebugProperty("INTERPRETER") |
| 2116 if not interpreter or not Utilities.isinpath(interpreter): | 2103 if not interpreter or not Utilities.isinpath(interpreter): |
| 2117 # get it from debugger settings second | 2104 # get it from debugger settings second |
| 2118 if self.__projectLanguage == "Python2": | 2105 if self.__projectLanguage in ("Python3", "MicroPython"): |
| 2119 interpreter = Preferences.getDebugger( | |
| 2120 "PythonInterpreter") | |
| 2121 elif self.__projectLanguage in ("Python3", "MicroPython"): | |
| 2122 interpreter = Preferences.getDebugger( | 2106 interpreter = Preferences.getDebugger( |
| 2123 "Python3Interpreter") | 2107 "Python3Interpreter") |
| 2124 else: | 2108 else: |
| 2125 interpreter = "" | 2109 interpreter = "" |
| 2126 if interpreter: | 2110 if interpreter: |
