reverts whitespace and unwanted changes including functions, comments…

… and formatting
python · terryjreedy · Feb 1, 2021 · Sep 28, 2019 · Oct 6, 2019 · Oct 6, 2019
commit 7d2354ac2f1a9b83f97d5602b0b910f20d823592
diff --git a/Lib/pyclbr.py b/Lib/pyclbr.py
@@ -43,6 +43,7 @@
 import importlib.util
 import tokenize
 from token import NAME, DEDENT, OP
+import inspect
 
 __all__ = ["readmodule", "readmodule_ex", "Class", "Function"]
 
@@ -51,7 +52,6 @@
 
 class _Object:
     "Information about Python class or function."
-
     def __init__(self, module, name, file, lineno, parent):
         self.module = module
         self.name = name
@@ -84,13 +84,8 @@ def _addmethod(self, name, lineno):
 
 
 class Stack(list):
-
-    def __init__(self):
-        import inspect
-        super().__init__()
-
+
     def __delitem__(self, key):
-        import inspect
         frames = inspect.stack()
         setattr(self[key][0], 'endline',
                 frames[1].frame.f_locals['start'][0] - 1)
@@ -182,8 +177,7 @@ def _readmodule(module, path, inpackage=None):
         search_path = path + sys.path
     spec = importlib.util._find_spec_from_path(fullmodule, search_path)
     if spec is None:
-        raise ModuleNotFoundError(
-            f"no module named {fullmodule!r}", name=fullmodule)
+        raise ModuleNotFoundError(f"no module named {fullmodule!r}", name=fullmodule)
     _modules[fullmodule] = tree
     # Is module a package?
     if spec.submodule_search_locations is not None:
@@ -215,8 +209,7 @@ def _create_tree(fullmodule, path, fname, source, tree, inpackage):
     """
     f = io.StringIO(source)
 
-    # stack = []  # Initialize stack of (class, indent) pairs.
-    stack = Stack()  # changing the source code so as to get the ending line
+    stack = Stack()  # Initialize stack of (class, indent) pairs.
     g = tokenize.generate_tokens(f.readline)
     try:
         for tokentype, token, start, _end, _line in g:
@@ -249,14 +242,14 @@ def _create_tree(fullmodule, path, fname, source, tree, inpackage):
                     del stack[-1]
                 tokentype, class_name, start = next(g)[0:3]
                 if tokentype != NAME:
-                    continue  # Skip class with syntax error.
+                    continue # Skip class with syntax error.
                 # Parse what follows the class name.
                 tokentype, token, start = next(g)[0:3]
                 inherit = None
                 if token == '(':
-                    names = []  # Initialize list of superclasses.
+                    names = [] # Initialize list of superclasses.
                     level = 1
-                    super = []  # Tokens making up current superclass.
+                    super = [] # Tokens making up current superclass.
                     while True:
                         tokentype, token, start = next(g)[0:3]
                         if token in (')', ',') and level == 1:
@@ -293,7 +286,7 @@ def _create_tree(fullmodule, path, fname, source, tree, inpackage):
                 if stack:
                     cur_obj = stack[-1][0]
                     cur_class = _nest_class(
-                        cur_obj, class_name, lineno, inherit)
+                            cur_obj, class_name, lineno, inherit)
                 else:
                     cur_class = Class(fullmodule, class_name, inherit,
                                       fname, lineno)
@@ -399,7 +392,7 @@ def _main():
     else:
         path = []
     tree = readmodule_ex(mod, path)
-    def lineno_key(a): return getattr(a, 'lineno', 0)
+    lineno_key = lambda a: getattr(a, 'lineno', 0)
     objs = sorted(tree.values(), key=lineno_key, reverse=True)
     indent_level = 2
     while objs:
@@ -422,6 +415,5 @@ def lineno_key(a): return getattr(a, 'lineno', 0)
         elif isinstance(obj, Function):
             print("{}def {} {}".format(' ' * obj.indent, obj.name, obj.lineno))
 
-
 if __name__ == "__main__":
     _main()