Mercurial Repositories > Eric Assistant / file diff

--- a/AssistantEric/Assistant.py	Sat Dec 31 13:50:18 2016 +0100
+++ b/AssistantEric/Assistant.py	Mon Mar 27 19:27:58 2017 +0200
@@ -185,17 +185,17 @@
     ## auto-completion methods below
     #################################
     
-    def __completionListSelected(self, id, txt):
+    def __completionListSelected(self, userListId, txt):
         """
         Private slot to handle the selection from the completion list.
         
-        @param id the ID of the user list (should be 1) (integer)
+        @param userListId the ID of the user list (should be 1) (integer)
         @param txt the selected text (string)
         """
         from QScintilla.Editor import EditorAutoCompletionListID
         
         editor = self.sender()
-        if id == EditorAutoCompletionListID:
+        if userListId == EditorAutoCompletionListID:
             lst = txt.split()
             if len(lst) > 1:
                 txt = lst[0]
@@ -219,17 +219,17 @@
             editor.insert(txt)
             editor.setCursorPosition(line, col + len(txt))
     
-    def __recordSelectedContext(self, id, txt):
+    def __recordSelectedContext(self, userListId, txt):
         """
         Private slot to handle the selection from the completion list to
         record the selected completion context.
         
-        @param id the ID of the user list (should be 1) (integer)
+        @param userListId the ID of the user list (should be 1) (integer)
         @param txt the selected text (string)
         """
         from QScintilla.Editor import EditorAutoCompletionListID
         
-        if id == EditorAutoCompletionListID:
+        if userListId == EditorAutoCompletionListID:
             lst = txt.split()
             if len(lst) > 1:
                 self.__lastFullContext = lst[1][1:].split(")")[0]
@@ -490,11 +490,11 @@
                     if line >= cl.lineno and \
                        (cl.endlineno == -1 or line <= cl.endlineno):
                         completions = []
-                        for super in cl.super:
+                        for superClass in cl.super:
                             if prefix == word:
                                 completions.extend(
                                     api.getCompletions(
-                                        context=super,
+                                        context=superClass,
                                         followHierarchy=self.__plugin
                                         .getPreferences(
                                             "AutoCompletionFollowHierarchy"
@@ -504,7 +504,7 @@
                             else:
                                 completions.extend(
                                     api.getCompletions(
-                                        start=word, context=super,
+                                        start=word, context=superClass,
                                         followHierarchy=self.__plugin
                                         .getPreferences(
                                             "AutoCompletionFollowHierarchy"
@@ -880,9 +880,9 @@
             for cl in module.classes.values():
                 if line >= cl.lineno and \
                    (cl.endlineno == -1 or line <= cl.endlineno):
-                    for super in cl.super:
+                    for superClass in cl.super:
                         calltips.extend(api.getCalltips(
-                            word, commas, super, None,
+                            word, commas, superClass, None,
                             self.__plugin.getPreferences(
                                 "CallTipsContextShown"),
                             followHierarchy=self.__plugin.getPreferences(