eric: comparison Utilities/ClassBrowsers/pyclbr.py

-:4f2dd0850803
+:b047181a4a33
 class Class(ClbrBaseClasses.Class, VisibilityMixin):
 """
 Class to represent a Python 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)
 class Function(ClbrBaseClasses.Function, VisibilityMixin):
 """
 @param isPyFile flag indicating a Python file (boolean)
 @return the resulting dictionary
 """
 global _modules
-dict = {}
+dictionary = {}
 dict_counts = {}
 if module in _modules:
 # we've seen this module before...
 return _modules[module]
 if module in sys.builtin_module_names:
 # this is a built-in module
-_modules[module] = dict
+_modules[module] = dictionary
-return dict
+return dictionary
 # search the path for the module
 f = None
 if inpackage:
 try:
 if f is None:
 fullpath = list(path) + sys.path
 f, file, (suff, mode, type) = \
 ClassBrowsers.find_module(module, fullpath, isPyFile)
 if module.endswith(".py") and type == imp.PKG_DIRECTORY:
-return dict
+return dictionary
 if type == imp.PKG_DIRECTORY:
-dict['__path__'] = [file]
+dictionary['__path__'] = [file]
-_modules[module] = dict
+_modules[module] = dictionary
 path = [file] + path
 f, file, (suff, mode, type) = \
 ClassBrowsers.find_module('__init__', [file])
 if f:
 f.close()
 if type not in SUPPORTED_TYPES:
 # not Python source, can't do anything with this module
-_modules[module] = dict
+_modules[module] = dictionary
-return dict
+return dictionary
-_modules[module] = dict
+_modules[module] = dictionary
 classstack = []  # stack of (class, indent) pairs
 conditionalsstack = []  # stack of indents of conditional defines
 deltastack = []
 deltaindent = 0
 deltaindentcalculated = 0
 try:
 src = Utilities.readEncodedFile(file)[0]
 except (UnicodeError, IOError):
 # can't do anything with this module
-_modules[module] = dict
+_modules[module] = dictionary
-return dict
+return dictionary
 lineno, last_lineno_pos = 1, 0
 lastGlobalEntry = None
 cur_obj = None
 i = 0
 dict_counts[meth_name] += 1
 meth_name = "{0}_{1:d}".format(
 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)
 lastGlobalEntry = f
 if cur_obj and isinstance(cur_obj, Function):
 inherit = inherit[1:-1].strip()
 inherit = _commentsub('', inherit)
 names = []
 for n in inherit.split(','):
 n = n.strip()
-if n in dict:
+if n in dictionary:
 # we know this super class
-n = dict[n]
+n = dictionary[n]
 else:
 c = n.split('.')
 if len(c) > 1:
 # super class
 # is of the
 dict_counts[class_name] += 1
 class_name = "{0}_{1:d}".format(
 class_name, dict_counts[class_name])
 else:
 dict_counts[class_name] = 0
-dict[class_name] = cur_class
+dictionary[class_name] = cur_class
 else:
 classstack[-1][0]._addclass(class_name, cur_class)
 if not classstack:
 if lastGlobalEntry:
 lastGlobalEntry.setEndLine(lineno - 1)
 variable_name = m.group("VariableName")
 lineno = lineno + src.count('\n', last_lineno_pos, start)
 last_lineno_pos = start
 if thisindent == 0:
 # global variable
-if "@@Globals@@" not in dict:
+if "@@Globals@@" not in dictionary:
-dict["@@Globals@@"] = ClbrBaseClasses.ClbrBase(
+dictionary["@@Globals@@"] = ClbrBaseClasses.ClbrBase(
 module, "Globals", file, lineno)
-dict["@@Globals@@"]._addglobal(
+dictionary["@@Globals@@"]._addglobal(
 Attribute(module, variable_name, file, lineno))
 if lastGlobalEntry:
 lastGlobalEntry.setEndLine(lineno - 1)
 lastGlobalEntry = None
 else:
 elif m.start("Publics") >= 0:
 idents = m.group("Identifiers")
 lineno = lineno + src.count('\n', last_lineno_pos, start)
 last_lineno_pos = start
 pubs = Publics(module, file, lineno, idents)
-dict['__all__'] = pubs
+dictionary['__all__'] = pubs
 elif m.start("Import") >= 0:
 # import module
 names = [n.strip() for n in
 "".join(m.group("ImportList").splitlines())
 .replace("\\", "").split(',')]
 lineno = lineno + src.count('\n', last_lineno_pos, start)
 last_lineno_pos = start
-if "@@Import@@" not in dict:
+if "@@Import@@" not in dictionary:
-dict["@@Import@@"] = Imports(module, file)
+dictionary["@@Import@@"] = Imports(module, file)
 for name in names:
-dict["@@Import@@"].addImport(name, [], lineno)
+dictionary["@@Import@@"].addImport(name, [], lineno)
 elif m.start("ImportFrom") >= 0:
 # from module import stuff
 mod = m.group("ImportFromPath")
 namesLines = (m.group("ImportFromList")
 names = [n.strip() for n in
 "".join(namesLines)
 .split(',')]
 lineno = lineno + src.count('\n', last_lineno_pos, start)
 last_lineno_pos = start
-if "@@Import@@" not in dict:
+if "@@Import@@" not in dictionary:
-dict["@@Import@@"] = Imports(module, file)
+dictionary["@@Import@@"] = Imports(module, file)
-dict["@@Import@@"].addImport(mod, names, lineno)
+dictionary["@@Import@@"].addImport(mod, names, lineno)
 elif m.start("ConditionalDefine") >= 0:
 # a conditional function/method definition
 thisindent = _indent(m.group("ConditionalDefineIndent"))
 while conditionalsstack and \
 elif m.start("CodingLine") >= 0:
 # a coding statement
 coding = m.group("Coding")
 lineno = lineno + src.count('\n', last_lineno_pos, start)
 last_lineno_pos = start
-if "@@Coding@@" not in dict:
+if "@@Coding@@" not in dictionary:
-dict["@@Coding@@"] = ClbrBaseClasses.Coding(
+dictionary["@@Coding@@"] = ClbrBaseClasses.Coding(
 module, file, lineno, coding)
 else:
 assert 0, "regexp _getnext found something unexpected"
-if '__all__' in dict:
+if '__all__' in dictionary:
 # set visibility of all top level elements
-pubs = dict['__all__']
+pubs = dictionary['__all__']
-for key in list(list(dict.keys())):
+for key in dictionary.keys():
 if key == '__all__' or key.startswith("@@"):
 continue
 if key in pubs.identifiers:
-dict[key].setPublic()
+dictionary[key].setPublic()
 else:
-dict[key].setPrivate()
+dictionary[key].setPrivate()
-del dict['__all__']
+del dictionary['__all__']
-return dict
+return dictionary
 def _indent(ws):
 """
 Module function to return the indentation depth.

Mercurial Repositories > eric / file comparison

comparison: Utilities/ClassBrowsers/pyclbr.py

Utilities/ClassBrowsers/pyclbr.py