PluginRefactoringRope.py

changeset 153
9557ef516806
parent 151
5260100b6700
child 155
124974b2013d
diff -r d5f61819a69a -r 9557ef516806 PluginRefactoringRope.py
--- a/PluginRefactoringRope.py	Tue Mar 28 19:36:46 2017 +0200
+++ b/PluginRefactoringRope.py	Sun Apr 23 18:04:12 2017 +0200
@@ -26,7 +26,7 @@
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
 autoactivate = True
 deactivateable = True
-version = "4.2.7"
+version = "4.3.0"
 className = "RefactoringRopePlugin"
 packageName = "RefactoringRope"
 internalPackages = "rope"
@@ -105,14 +105,12 @@
             os.path.join("RefactoringRope", "ConfigurationPage",
                          "preferences-refactoring.png"),
             createCallTipsPage, "editorCalltipsPage", None],
-    }
-    
-    if e5App().getObject("UserInterface").versionIsNewer("6.0.99", "20150627"):
-        data["ropeMouseClickHandlerPage"] = [
+        "ropeMouseClickHandlerPage": [
             QCoreApplication.translate("RefactoringRopePlugin", "Rope"),
             os.path.join("RefactoringRope", "ConfigurationPage",
                          "preferences-refactoring.png"),
-            createMouseClickHandlerPage, "1editorMouseClickHandlers", None]
+            createMouseClickHandlerPage, "1editorMouseClickHandlers", None],
+    }
     
     return data
 
@@ -144,7 +142,6 @@
             "CodeAssistEnabled": False,
             "MaxFixes": 10,
             "CodeAssistTimeout": 100,
-            "ShowQScintillaCompletions": True,
             
             "CodeAssistCalltipsEnabled": False,
             "CalltipsMaxFixes": 10,
@@ -179,19 +176,6 @@
         self.__savedEditorName = None
         self.__oldEditorText = ""
     
-    def __checkUiVersion(self):
-        """
-        Private method to check, if the IDE has a suitable version.
-        
-        @return flag indicating a suitable version (boolean)
-        """
-        global error
-        
-        suitable = self.__ui.versionIsNewer("5.99.99", "20140701")
-        if not suitable:
-            error = self.tr("Your version of eric6 is not supported.")
-        return suitable
-    
     def activate(self):
         """
         Public method to activate this plugin.
@@ -201,9 +185,6 @@
         global error
         error = ""     # clear previous error
         
-        if not self.__checkUiVersion():
-            return None, False
-        
         global refactoringRopePluginObject
         refactoringRopePluginObject = self
         
@@ -326,7 +307,7 @@
         @return the requested refactoring setting
         """
         if key in ["CodeAssistEnabled", "CodeAssistCalltipsEnabled",
-                   "ShowQScintillaCompletions", "MouseClickEnabled"]:
+                   "MouseClickEnabled"]:
             return Preferences.toBool(Preferences.Prefs.settings.value(
                 self.PreferencesKey + "/" + key, self.__defaults[key]))
         else:
@@ -600,8 +581,7 @@
             if self.__currentEditor.isListActive():
                 self.__currentEditor.cancelList()
             completions = self.getCompletionsList(self.__currentEditor, False)
-            if len(completions) == 0 and \
-                    self.getPreferences("ShowQScintillaCompletions"):
+            if len(completions) == 0:
                 # try QScintilla autocompletion
                 self.__currentEditor.autoCompleteQScintilla()
             else:

eric ide

mercurial