put _nest_function, _nest_class inside pyclbr again, for tests

Author: isidentical

Doc/library/pyclbr.rst

@@ -94,7 +94,7 @@ statements.  They have the following attributes:
    .. versionadded:: 3.7
 
 
-.. attribute:: Function.parent
+.. attribute:: Function.is_async
 
    ``True`` for functions that are defined with the ``async`` prefix, ``False`` otherwise.
 

Lib/idlelib/idle_test/test_browser.py

@@ -60,28 +60,16 @@ def test_close(self):
 
 # Nested tree same as in test_pyclbr.py except for supers on C0. C1.
 mb = pyclbr
-def _nest_function(ob, func_name, lineno):
-    newfunc = mb.Function(ob.module, func_name, ob.file, lineno, ob)
-    ob._addchild(func_name, newfunc)
-    if isinstance(ob, mb.Class):
-        ob._addmethod(func_name, lineno)
-    return newfunc
-
-def _nest_class(ob, class_name, lineno, super=None):
-    newclass = mb.Class(ob.module, class_name, super, ob.file, lineno, ob)
-    ob._addchild(class_name, newclass)
-    return newclass
-
 module, fname = 'test', 'test.py'
 C0 = mb.Class(module, 'C0', ['base'], fname, 1)
-F1 = _nest_function(C0, 'F1', 3)
-C1 = _nest_class(C0, 'C1', 6, [''])
-C2 = _nest_class(C1, 'C2', 7)
-F3 = _nest_function(C2, 'F3', 9)
+F1 = mb._nest_function(C0, 'F1', 3)
+C1 = mb._nest_class(C0, 'C1', 6, [''])
+C2 = mb._nest_class(C1, 'C2', 7)
+F3 = mb._nest_function(C2, 'F3', 9)
 f0 = mb.Function(module, 'f0', fname, 11)
-f1 = _nest_function(f0, 'f1', 12)
-f2 = _nest_function(f1, 'f2', 13)
-c1 = _nest_class(f0, 'c1', 15)
+f1 = mb._nest_function(f0, 'f1', 12)
+f2 = mb._nest_function(f1, 'f2', 13)
+c1 = mb._nest_class(f0, 'c1', 15)
 mock_pyclbr_tree = {'C0': C0, 'f0': f0}
 
 # Adjust C0.name, C1.name so tests do not depend on order.

Lib/pyclbr.py

@@ -84,6 +84,22 @@ def __init__(self, module, name, super_, file, lineno, parent=None):
     def _addmethod(self, name, lineno):
         self.methods[name] = lineno
 
+# This 2 functions are used in these tests
+# Lib/test/test_pyclbr, Lib/idlelib/idle_test/test_browser.py
+def _nest_function(ob, func_name, lineno, is_async=False):
+    "Return a Function after nesting within ob."
+    newfunc = Function(ob.module, func_name, ob.file, lineno, ob, is_async)
+    ob._addchild(func_name, newfunc)
+    if isinstance(ob, Class):
+        ob._addmethod(func_name, lineno)
+    return newfunc
+
+def _nest_class(ob, class_name, lineno, super=None):
+    "Return a Class after nesting within ob."
+    newclass = Class(ob.module, class_name, super, ob.file, lineno, ob)
+    ob._addchild(class_name, newclass)
+    return newclass
+
 def readmodule(module, path=None):
     """Return Class objects for the top-level classes in module.
 
@@ -169,7 +185,7 @@ def _readmodule(module, path, inpackage=None):
     return _create_tree(fullmodule, path, fname, source, tree, inpackage)
 
 
-class _ClassBrowser(ast.NodeVisitor):
+class _ModuleBrowser(ast.NodeVisitor):
     def __init__(self, module, path, file, tree, inpackage):
         self.path = path
         self.tree = tree
@@ -281,9 +297,9 @@ def visit_ImportFrom(self, node):
 
 
 def _create_tree(fullmodule, path, fname, source, tree, inpackage):
-    cbrowser = _ClassBrowser(fullmodule, path, fname, tree, inpackage)
-    cbrowser.visit(ast.parse(source))
-    return cbrowser.tree
+    mbrowser = _ModuleBrowser(fullmodule, path, fname, tree, inpackage)
+    mbrowser.visit(ast.parse(source))
+    return mbrowser.tree
 
 
 def _main():

Lib/test/test_pyclbr.py

@@ -175,27 +175,16 @@ def F3(): return 1+1
         """)
         actual = mb._create_tree(m, p, f, source, t, i)
 
-        def _nest_function(ob, func_name, lineno):
-            newfunc = mb.Function(ob.module, func_name, ob.file, lineno, ob)
-            ob._addchild(func_name, newfunc)
-            if isinstance(ob, mb.Class):
-                ob._addmethod(func_name, lineno)
-            return newfunc
-
-        def _nest_class(ob, class_name, lineno, super=None):
-            newclass = mb.Class(ob.module, class_name, super, ob.file, lineno, ob)
-            ob._addchild(class_name, newclass)
-            return newclass
-
+        # Create descriptors, linked together, and expected dict.
         f0 = mb.Function(m, 'f0', f, 1)
-        f1 = _nest_function(f0, 'f1', 2)
-        f2 = _nest_function(f1, 'f2', 3)
-        c1 = _nest_class(f0, 'c1', 5)
+        f1 = mb._nest_function(f0, 'f1', 2)
+        f2 = mb._nest_function(f1, 'f2', 3)
+        c1 = mb._nest_class(f0, 'c1', 5)
         C0 = mb.Class(m, 'C0', None, f, 6)
-        F1 = _nest_function(C0, 'F1', 8)
-        C1 = _nest_class(C0, 'C1', 11)
-        C2 = _nest_class(C1, 'C2', 12)
-        F3 = _nest_function(C2, 'F3', 14)
+        F1 = mb._nest_function(C0, 'F1', 8)
+        C1 = mb._nest_class(C0, 'C1', 11)
+        C2 = mb._nest_class(C1, 'C2', 12)
+        F3 = mb._nest_function(C2, 'F3', 14)
         expected = {'f0':f0, 'C0':C0}
 
         def compare(parent1, children1, parent2, children2):