diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-10-16 09:57:54 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2018-10-16 09:57:54 +0900 |
| commit | e7e07fd69723c02d6b011142f5e97fe2d42bd7d9 (patch) | |
| tree | 1fe9194dd4115ed070212641ecc46e7d8846d13d /sphinx/ext/inheritance_diagram.py | |
| parent | 25678f391d55a701b7d5f2d2e214db980dcebbd3 (diff) | |
| parent | be2b86cc15a2f5fca1581c25ebf2db9a189dbc41 (diff) | |
| download | sphinx-git-e7e07fd69723c02d6b011142f5e97fe2d42bd7d9.tar.gz | |
Merge branch '1.8'
Diffstat (limited to 'sphinx/ext/inheritance_diagram.py')
| -rw-r--r-- | sphinx/ext/inheritance_diagram.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/ext/inheritance_diagram.py b/sphinx/ext/inheritance_diagram.py index b6b9c8535..3815f6ba1 100644 --- a/sphinx/ext/inheritance_diagram.py +++ b/sphinx/ext/inheritance_diagram.py @@ -77,7 +77,7 @@ def try_import(objname): __import__(objname) return sys.modules.get(objname) # type: ignore except (ImportError, ValueError): # ValueError,py27 -> ImportError,py3 - matched = module_sig_re.match(objname) # type: ignore + matched = module_sig_re.match(objname) if not matched: return None @@ -88,7 +88,7 @@ def try_import(objname): return None try: __import__(modname) - return getattr(sys.modules.get(modname), attrname, None) + return getattr(sys.modules.get(modname), attrname, None) # type: ignore except (ImportError, ValueError): # ValueError,py27 -> ImportError,py3 return None |