Skip to content
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

Fix #4019: exception treatment for AttributeError stopping make process #4532

Merged
merged 6 commits into from
Feb 2, 2018
Merged

Fix #4019: exception treatment for AttributeError stopping make process #4532

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eb9c18b
Fix #4019: exception treatment for NoneType group attibute.
dpizetta Sep 4, 2017
2812706
Including change and author
dpizetta Jan 31, 2018
953a303
Merge pull request #1 from dpizetta/bug-objname-nonetype
dpizetta Jan 31, 2018
1d174a7
Reimplement fix for #4019
dpizetta Feb 1, 2018
d3d4d94
Add test for fix #4019
dpizetta Feb 1, 2018
aacc986
Catching ValueError when importing for py27 compatibility
dpizetta Feb 2, 2018
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
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Other contributors, listed alphabetically, are:
* Joel Wurtz -- cellspanning support in LaTeX
* Hong Xu -- svg support in imgmath extension and various bug fixes
* Stephen Finucane -- setup command improvements and documentation
* Daniel Pizetta -- inheritance diagram improvements

Many thanks for all contributions!

Expand Down
1 change: 1 addition & 0 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Features added

Bugs fixed
----------
* #4019: inheritance_diagram AttributeError stoping make process

Testing
--------
Expand Down
16 changes: 10 additions & 6 deletions sphinx/ext/inheritance_diagram.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,18 @@ def try_import(objname):
__import__(objname)
return sys.modules.get(objname) # type: ignore
except ImportError:
modname, attrname = module_sig_re.match(objname).groups() # type: ignore
if modname is None:
return None
try:
__import__(modname)
return getattr(sys.modules.get(modname), attrname, None)
except ImportError:
modname, attrname = module_sig_re.match(objname).groups() # type: ignore
except AttributeError:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about this? It would be better to check the matched or not before calling group() to me.

matched = module_sig_re.match(objname)  # type: ignore
if not matched:
    return None

modname, attrname = matched.groups()
...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeh, really better :) And I will provide the test.

return None
else:
if modname is None:
return None
try:
__import__(modname)
return getattr(sys.modules.get(modname), attrname, None)
except ImportError:
return None


def import_classes(name, currmodule):
Expand Down