Mercurial Repositories > eric / file diff

--- a/Utilities/ClassBrowsers/rbclbr.py	Sat Mar 11 14:35:22 2017 +0100
+++ b/Utilities/ClassBrowsers/rbclbr.py	Sat Mar 11 18:08:42 2017 +0100
@@ -180,17 +180,18 @@
     """
     Class to represent a Ruby class.
     """
-    def __init__(self, module, name, super, file, lineno):
+    def __init__(self, module, name, superClasses, file, lineno):
         """
         Constructor
         
         @param module name of the module containing this class
         @param name name of this class
-        @param super list of class names this class is inherited from
+        @param superClasses list of class names this class is inherited from
         @param file filename containing this class
         @param lineno linenumber of the class definition
         """
-        ClbrBaseClasses.Class.__init__(self, module, name, super, file, lineno)
+        ClbrBaseClasses.Class.__init__(self, module, name, superClasses, file,
+                                       lineno)
         VisibilityMixin.__init__(self)
 
 
@@ -260,7 +261,7 @@
     """
     global _modules
     
-    dict = {}
+    dictionary = {}
     dict_counts = {}
 
     if module in _modules:
@@ -275,10 +276,10 @@
         f.close()
     if type not in SUPPORTED_TYPES:
         # not Ruby source, can't do anything with this module
-        _modules[module] = dict
-        return dict
+        _modules[module] = dictionary
+        return dictionary
 
-    _modules[module] = dict
+    _modules[module] = dictionary
     classstack = []  # stack of (class, indent) pairs
     acstack = []    # stack of (access control, indent) pairs
     indent = 0
@@ -286,8 +287,8 @@
         src = Utilities.readEncodedFile(file)[0]
     except (UnicodeError, IOError):
         # can't do anything with this module
-        _modules[module] = dict
-        return dict
+        _modules[module] = dictionary
+        return dictionary
 
     lineno, last_lineno_pos = 1, 0
     cur_obj = None
@@ -356,7 +357,7 @@
                         meth_name, dict_counts[meth_name])
                 else:
                     dict_counts[meth_name] = 0
-                dict[meth_name] = f
+                dictionary[meth_name] = f
             if not classstack:
                 if lastGlobalEntry:
                     lastGlobalEntry.setEndLine(lineno - 1)
@@ -398,10 +399,10 @@
             cur_class = Class(module, class_name, inherit,
                               file, lineno)
             if not classstack:
-                if class_name in dict:
-                    cur_class = dict[class_name]
+                if class_name in dictionary:
+                    cur_class = dictionary[class_name]
                 else:
-                    dict[class_name] = cur_class
+                    dictionary[class_name] = cur_class
             else:
                 cls = classstack[-1][0]
                 if class_name in cls.classes:
@@ -439,10 +440,10 @@
             # remember this class
             cur_class = Module(module, module_name, file, lineno)
             if not classstack:
-                if module_name in dict:
-                    cur_class = dict[module_name]
+                if module_name in dictionary:
+                    cur_class = dictionary[module_name]
                 else:
-                    dict[module_name] = cur_class
+                    dictionary[module_name] = cur_class
             else:
                 cls = classstack[-1][0]
                 if module_name in cls.classes:
@@ -582,11 +583,11 @@
             coding = m.group("Coding")
             lineno = lineno + src.count('\n', last_lineno_pos, start)
             last_lineno_pos = start
-            if "@@Coding@@" not in dict:
-                dict["@@Coding@@"] = ClbrBaseClasses.Coding(
+            if "@@Coding@@" not in dictionary:
+                dictionary["@@Coding@@"] = ClbrBaseClasses.Coding(
                     module, file, lineno, coding)
 
         else:
             assert 0, "regexp _getnext found something unexpected"
 
-    return dict
+    return dictionary