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

Catching ValueError when importing for py27 compatibility

Browse Source
This commit is contained in:
Daniel Pizetta 2018-02-02 11:36:48 -02:00
parent d3d4d94970
commit aacc9863cc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sphinx/ext/inheritance_diagram.py
View File

@ -75,7 +75,7 @@ def try_import(objname):
try: try:
__import__(objname) __import__(objname)
return sys.modules.get(objname) # type: ignore return sys.modules.get(objname) # type: ignore
except ImportError: except (ImportError, ValueError): # ValueError,py27 -> ImportError,py3
matched = module_sig_re.match(objname) # type: ignore matched = module_sig_re.match(objname) # type: ignore
if not matched: if not matched:
@ -88,7 +88,7 @@ def try_import(objname):
try: try:
__import__(modname) __import__(modname)
return getattr(sys.modules.get(modname), attrname, None) return getattr(sys.modules.get(modname), attrname, None)
except ImportError: except (ImportError, ValueError): # ValueError,py27 -> ImportError,py3
return None return None