Mercurial Repositories > Rope Refactoring / file diff

--- a/RefactoringRope/RefactoringServer.py	Sat May 02 15:05:16 2020 +0200
+++ b/RefactoringRope/RefactoringServer.py	Mon Jun 22 18:08:10 2020 +0200
@@ -1096,8 +1096,6 @@
         @param kind kind of extraction to be done
         @type str ("method" or "variable")
         """
-        assert kind in ["variable", "method"]
-        
         aw = self.__vm.activeWindow()
         
         if aw is None:
@@ -2066,18 +2064,7 @@
                     isRemote = False
                 if (not venvName) or isRemote:
                     # get it from debugger settings next
-                    if self.__projectLanguage == "Python2":
-                        # Python 2
-                        venvName = Preferences.getDebugger("Python2VirtualEnv")
-                        if not venvName and sys.version_info[0] == 2:
-                            try:
-                                venvName, _ = (
-                                    venvManager.getDefaultEnvironment()
-                                )
-                            except AttributeError:
-                                # ignore for eric6 < 18.10
-                                pass
-                    elif self.__projectLanguage in ("Python3", "MicroPython"):
+                    if self.__projectLanguage in ("Python3", "MicroPython"):
                         # Python 3
                         venvName = Preferences.getDebugger("Python3VirtualEnv")
                         if not venvName and sys.version_info[0] >= 3:
@@ -2115,10 +2102,7 @@
                 interpreter = self.__e5project.getDebugProperty("INTERPRETER")
                 if not interpreter or not Utilities.isinpath(interpreter):
                     # get it from debugger settings second
-                    if self.__projectLanguage == "Python2":
-                        interpreter = Preferences.getDebugger(
-                            "PythonInterpreter")
-                    elif self.__projectLanguage in ("Python3", "MicroPython"):
+                    if self.__projectLanguage in ("Python3", "MicroPython"):
                         interpreter = Preferences.getDebugger(
                             "Python3Interpreter")
                     else: