Utilities/ClassBrowsers/idlclbr.py

changeset 5604
b047181a4a33
parent 5389
9b1c800daff3
child 5651
982465f8389c
diff -r 4f2dd0850803 -r b047181a4a33 Utilities/ClassBrowsers/idlclbr.py
--- a/Utilities/ClassBrowsers/idlclbr.py	Sat Mar 11 14:35:22 2017 +0100
+++ b/Utilities/ClassBrowsers/idlclbr.py	Sat Mar 11 18:08:42 2017 +0100
@@ -127,17 +127,19 @@
     """
     Class to represent a CORBA IDL interface.
     """
-    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 interface
-        @param super list of interface names this interface is inherited from
+        @param superClasses list of interface names this interface is
+            inherited from
         @param file filename containing this interface
         @param lineno linenumber of the interface definition
         """
-        ClbrBaseClasses.Class.__init__(self, module, name, super, file, lineno)
+        ClbrBaseClasses.Class.__init__(self, module, name, superClasses, file,
+                                       lineno)
         VisibilityMixin.__init__(self)
 
 
@@ -190,7 +192,7 @@
     """
     global _modules
     
-    dict = {}
+    dictionary = {}
     dict_counts = {}
 
     if module in _modules:
@@ -205,18 +207,18 @@
         f.close()
     if type not in SUPPORTED_TYPES:
         # not CORBA IDL 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
     indent = 0
     try:
         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
     lastGlobalEntry = None
@@ -267,7 +269,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)
@@ -306,7 +308,7 @@
             cur_class = Interface(module, class_name, inherit,
                                   file, lineno)
             if not classstack:
-                dict[class_name] = cur_class
+                dictionary[class_name] = cur_class
             else:
                 cls = classstack[-1][0]
                 cls._addclass(class_name, cur_class)
@@ -336,7 +338,7 @@
             # remember this module
             cur_class = Module(module, module_name, file, lineno)
             if not classstack:
-                dict[module_name] = cur_class
+                dictionary[module_name] = cur_class
                 if lastGlobalEntry:
                     lastGlobalEntry.setEndLine(lineno - 1)
                 lastGlobalEntry = cur_class
@@ -378,4 +380,4 @@
         else:
             assert 0, "regexp _getnext found something unexpected"
 
-    return dict
+    return dictionary

eric ide

mercurial