Fix #4019: exception treatment for NoneType group attibute.

sphinx-doc · Sep 4, 2017 · eb9c18b · eb9c18b
1 parent ff06cb8
commit eb9c18b
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/sphinx/ext/inheritance_diagram.py b/sphinx/ext/inheritance_diagram.py
@@ -80,14 +80,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):