drop general attribute hack and include py.test special case with test

Author: RonnyPfannschmidt

src/apipkg/__init__.py

@@ -191,21 +191,15 @@ def _py_test_hack(modpath, attrname, importerror_alternative):
         return importerror_alternative
 
 
-def _alias_mod_repr(modname, modpath, attrname, importerror_alternative):
+def _alias_mod_repr(modname, modpath, attrname):
     x = modpath
     if attrname:
         x += "." + attrname
-    if importerror_alternative is not ImportError:
-        return "<AliasModule {!r} for {!r} alternative {!r}>".format(
-            modname, x, importerror_alternative
-        )
-    else:
-        return "<AliasModule {!r} for {!r}>".format(modname, x)
+    return "<AliasModule {!r} for {!r}>".format(modname, x)
 
 
-def AliasModule(modname, modpath, attrname=None, importerror_alternative=ImportError):
+def AliasModule(modname, modpath, attrname=None):
     mod = []
-    importerror_alternative = _py_test_hack(modpath, attrname, importerror_alternative)
 
     def getmod():
         if not mod:
@@ -215,7 +209,7 @@ def getmod():
             mod.append(x)
         return mod[0]
 
-    repr_result = _alias_mod_repr(modname, modpath, attrname, importerror_alternative)
+    repr_result = _alias_mod_repr(modname, modpath, attrname)
 
     class AliasModule(ModuleType):
         def __repr__(self):
@@ -225,10 +219,11 @@ def __getattribute__(self, name):
             try:
                 return getattr(getmod(), name)
             except ImportError:
-                if importerror_alternative is ImportError:
-                    raise
+                if modpath == "pytest" and attrname is None:
+                    # hack for pylibs py.test
+                    return None
                 else:
-                    return importerror_alternative
+                    raise
 
         def __setattr__(self, name, value):
             setattr(getmod(), name, value)

test_apipkg.py

@@ -560,14 +560,6 @@ def test_aliasmodule_aliases_unimportable_fails():
         am.qwe is None
 
 
-def test_aliasmodule_aliases_unimportable_can_return_none():
-    am = apipkg.AliasModule("mymod", "qlwkejqlwe", "main", None)
-    r = repr(am)
-    assert "<AliasModule 'mymod' for 'qlwkejqlwe.main' alternative None>" == r
-    # this would pass starting with apipkg 1.3 to work around a pytest bug
-    assert am.qwe is None
-
-
 def test_aliasmodule_pytest_autoreturn_none_for_hack(monkeypatch):
     def error(*k):
         raise ImportError(k)
@@ -576,7 +568,7 @@ def error(*k):
     # apipkg 1.3 added this hack
     am = apipkg.AliasModule("mymod", "pytest")
     r = repr(am)
-    assert "<AliasModule 'mymod' for 'pytest' alternative None>" == r
+    assert "<AliasModule 'mymod' for 'pytest'>" == r
     assert am.test is None