IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from dpizetta/bug-objname-nonetype

Browse Source 
Fix #4019: exception treatment for NoneType group attribute.
This commit is contained in:
Daniel Pizetta 2018-01-31 14:57:26 -02:00 committed by GitHub
commit 953a303fd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sphinx/ext/inheritance_diagram.py
View File

@ -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:
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):