Mercurial Repositories > Rope Refactoring / file comparison
comparison: RefactoringRope/RefactoringServer.py
RefactoringRope/RefactoringServer.py
- changeset 315
- 7e173652a1f9
- parent 313
- 327178d25538
- child 320
- 91b171fdd85f
equal
deleted
inserted
replaced
| 314:0c1cd8ed44dd | 315:7e173652a1f9 |
|---|---|
| 2037 self.__projectpath = self.__e5project.getProjectPath() | 2037 self.__projectpath = self.__e5project.getProjectPath() |
| 2038 self.__projectLanguage = self.__e5project.getProjectLanguage() | 2038 self.__projectLanguage = self.__e5project.getProjectLanguage() |
| 2039 | 2039 |
| 2040 ok = False | 2040 ok = False |
| 2041 | 2041 |
| 2042 if self.__projectLanguage.startswith("Python"): | 2042 if (self.__projectLanguage.startswith("Python") or |
| 2043 self.__projectLanguage == "MicroPython"): | |
| 2043 clientEnv = os.environ.copy() | 2044 clientEnv = os.environ.copy() |
| 2044 if "PATH" in clientEnv: | 2045 if "PATH" in clientEnv: |
| 2045 try: | 2046 try: |
| 2046 clientEnv["PATH"] = self.__ui.getOriginalPathString() | 2047 clientEnv["PATH"] = self.__ui.getOriginalPathString() |
| 2047 except AttributeError: | 2048 except AttributeError: |
| 2070 venvName, _ = \ | 2071 venvName, _ = \ |
| 2071 venvManager.getDefaultEnvironment() | 2072 venvManager.getDefaultEnvironment() |
| 2072 except AttributeError: | 2073 except AttributeError: |
| 2073 # ignore for eric6 < 18.10 | 2074 # ignore for eric6 < 18.10 |
| 2074 pass | 2075 pass |
| 2075 elif self.__projectLanguage == "Python3": | 2076 elif self.__projectLanguage in ("Python3", "MicroPython"): |
| 2076 # Python 3 | 2077 # Python 3 |
| 2077 venvName = Preferences.getDebugger("Python3VirtualEnv") | 2078 venvName = Preferences.getDebugger("Python3VirtualEnv") |
| 2078 if not venvName and sys.version_info[0] == 3: | 2079 if not venvName and sys.version_info[0] == 3: |
| 2079 try: | 2080 try: |
| 2080 venvName, _ = \ | 2081 venvName, _ = \ |
| 2110 if not interpreter or not Utilities.isinpath(interpreter): | 2111 if not interpreter or not Utilities.isinpath(interpreter): |
| 2111 # get it from debugger settings second | 2112 # get it from debugger settings second |
| 2112 if self.__projectLanguage == "Python2": | 2113 if self.__projectLanguage == "Python2": |
| 2113 interpreter = Preferences.getDebugger( | 2114 interpreter = Preferences.getDebugger( |
| 2114 "PythonInterpreter") | 2115 "PythonInterpreter") |
| 2115 elif self.__projectLanguage == "Python3": | 2116 elif self.__projectLanguage in ("Python3", "MicroPython"): |
| 2116 interpreter = Preferences.getDebugger( | 2117 interpreter = Preferences.getDebugger( |
| 2117 "Python3Interpreter") | 2118 "Python3Interpreter") |
| 2118 else: | 2119 else: |
| 2119 interpreter = "" | 2120 interpreter = "" |
| 2120 if interpreter: | 2121 if interpreter: |
