Skip to content

bpo-6691: Support for nested classes and functions in pyclbr #2503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
terryjreedy merged 10 commits into from
Jul 4, 2017
Merged

bpo-6691: Support for nested classes and functions in pyclbr #2503

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b94e281
bpo-6691: Support for nested classes and functions in pyclbr
csabella Jun 30, 2017
a726dc1
bpo-6691: Support for nested classes and functions in pyclbr
csabella Jul 1, 2017
7105eed
Split _readmodule into two functions
csabella Jul 1, 2017
bcc1760
Remove conditional for isinstance
csabella Jul 2, 2017
83b10c7
Edit docstrings and comments.
terryjreedy Jul 3, 2017
b9243d7
Merge remote-tracking branch 'upstream/master' into pr_2503
terryjreedy Jul 3, 2017
2c28520
Revise doc
terryjreedy Jul 3, 2017
082e469
Replace Object with _Object
terryjreedy Jul 3, 2017
ed1b892
Expand docstring for _create_tree
terryjreedy Jul 3, 2017
259616c
Expand helper functions; replace new tests.
terryjreedy Jul 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove conditional for isinstance
  • Loading branch information
@csabella
csabella committed Jul 2, 2017
commit bcc1760bcbbe581fe30527ee4d757b330eb2ff20
21 changes: 8 additions & 13 deletions Lib/pyclbr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,11 @@ def _create_tree(fullmodule, path, fname, source, tree, inpackage):
cur_func = None
if stack:
cur_obj = stack[-1][0]
if isinstance(cur_obj, Object):
# It's a nested function or a method.
cur_func = _newfunction(cur_obj, func_name, lineno)
cur_obj._addchild(func_name, cur_func)

if isinstance(cur_obj, Class):
# it's a method
cur_obj._addmethod(func_name, lineno)
cur_func = _newfunction(cur_obj, func_name, lineno)
cur_obj._addchild(func_name, cur_func)
if isinstance(cur_obj, Class):
# it's a method
cur_obj._addmethod(func_name, lineno)
else:
# it's a function
cur_func = Function(fullmodule, func_name, fname, lineno)
Expand Down Expand Up @@ -268,11 +265,9 @@ def _create_tree(fullmodule, path, fname, source, tree, inpackage):
inherit = names
if stack:
cur_obj = stack[-1][0]
if isinstance(cur_obj, Object):
# Either a nested class or a class inside a function.
cur_class = _newclass(cur_obj, class_name, inherit,
lineno)
cur_obj._addchild(class_name, cur_class)
cur_class = _newclass(cur_obj, class_name, inherit,
lineno)
cur_obj._addchild(class_name, cur_class)
else:
cur_class = Class(fullmodule, class_name, inherit,
fname, lineno)
Expand Down