Reimplement fix for #4019

This commit is contained in:
Daniel Pizetta 2018-02-01 17:28:45 -02:00
parent 953a303fd4
commit 1d174a7dca

View File

@ -76,18 +76,20 @@ def try_import(objname):
__import__(objname)
return sys.modules.get(objname) # type: ignore
except ImportError:
try:
modname, attrname = module_sig_re.match(objname).groups() # type: ignore
except AttributeError:
matched = module_sig_re.match(objname) # type: ignore
if not matched:
return None
modname, attrname = matched.groups()
if modname is None:
return None
try:
__import__(modname)
return getattr(sys.modules.get(modname), attrname, None)
except ImportError:
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):