Split initpkg implementation to keep flake8 happy with complexity

Author: GlenWalker

src/apipkg/__init__.py

@@ -63,37 +63,63 @@ def initpkg(pkgname, exportdefs, attr=None, eager=False):
     attr = attr or {}
     mod = sys.modules.get(pkgname)
 
-    # In Python 2 we can't update __class__ for an instance of types.Module, and
-    # imports are protected by the global import lock anyway, so it is safe for a
-    # module to replace itself during import. Python 3.3+ uses finer grained locking
-    # for imports, and checks sys.modules before acquiring the lock to avoid the
-    # overhead of the fine-grained locking. This introduces a race condition when a
-    # module is imported by multiple threads concurrently - some threads will see the
-    # initial module and some the replacement ApiModule. We avoid this by updating the
-    # existing module in-place.
     if _PY2:
-        d = {}
-        f = getattr(mod, "__file__", None)
-        if f:
-            f = _py_abspath(f)
-        d["__file__"] = f
-        if hasattr(mod, "__version__"):
-            d["__version__"] = mod.__version__
-        if hasattr(mod, "__loader__"):
-            d["__loader__"] = mod.__loader__
-        if hasattr(mod, "__path__"):
-            d["__path__"] = [_py_abspath(p) for p in mod.__path__]
-        if hasattr(mod, "__package__"):
-            d["__package__"] = mod.__package__
-        if "__doc__" not in exportdefs and getattr(mod, "__doc__", None):
-            d["__doc__"] = mod.__doc__
-        d["__spec__"] = getattr(mod, "__spec__", None)
-        d.update(attr)
-        if hasattr(mod, "__dict__"):
-            mod.__dict__.update(d)
-        mod = ApiModule(pkgname, exportdefs, implprefix=pkgname, attr=d)
-        sys.modules[pkgname] = mod
-    elif mod is None:
+        mod = _initpkg_py2(mod, pkgname, exportdefs, attr=attr)
+    else:
+        mod = _initpkg_py3(mod, pkgname, exportdefs, attr=attr)
+
+    # eagerload in bypthon to avoid their monkeypatching breaking packages
+    if "bpython" in sys.modules or eager:
+        for module in list(sys.modules.values()):
+            if isinstance(module, ApiModule):
+                module.__dict__
+
+    return mod
+
+
+def _initpkg_py2(mod, pkgname, exportdefs, attr=None):
+    """Python 2 helper for initpkg.
+
+    In Python 2 we can't update __class__ for an instance of types.Module, and
+    imports are protected by the global import lock anyway, so it is safe for a
+    module to replace itself during import.
+
+    """
+    d = {}
+    f = getattr(mod, "__file__", None)
+    if f:
+        f = _py_abspath(f)
+    d["__file__"] = f
+    if hasattr(mod, "__version__"):
+        d["__version__"] = mod.__version__
+    if hasattr(mod, "__loader__"):
+        d["__loader__"] = mod.__loader__
+    if hasattr(mod, "__path__"):
+        d["__path__"] = [_py_abspath(p) for p in mod.__path__]
+    if hasattr(mod, "__package__"):
+        d["__package__"] = mod.__package__
+    if "__doc__" not in exportdefs and getattr(mod, "__doc__", None):
+        d["__doc__"] = mod.__doc__
+    d["__spec__"] = getattr(mod, "__spec__", None)
+    d.update(attr)
+    if hasattr(mod, "__dict__"):
+        mod.__dict__.update(d)
+    mod = ApiModule(pkgname, exportdefs, implprefix=pkgname, attr=d)
+    sys.modules[pkgname] = mod
+    return mod
+
+
+def _initpkg_py3(mod, pkgname, exportdefs, attr=None):
+    """Python 3 helper for initpkg.
+
+    Python 3.3+ uses finer grained locking for imports, and checks sys.modules before
+    acquiring the lock to avoid the overhead of the fine-grained locking. This
+    introduces a race condition when a module is imported by multiple threads
+    concurrently - some threads will see the initial module and some the replacement
+    ApiModule. We avoid this by updating the existing module in-place.
+
+    """
+    if mod is None:
         d = {"__file__": None, "__spec__": None}
         d.update(attr)
         mod = ApiModule(pkgname, exportdefs, implprefix=pkgname, attr=d)
@@ -114,13 +140,6 @@ def initpkg(pkgname, exportdefs, attr=None, eager=False):
         # Updating class of existing module as per importlib.util.LazyLoader
         mod.__class__ = ApiModule
         mod.__init__(pkgname, exportdefs, implprefix=pkgname, attr=attr)
-
-    # eagerload in bypthon to avoid their monkeypatching breaking packages
-    if "bpython" in sys.modules or eager:
-        for module in list(sys.modules.values()):
-            if isinstance(module, ApiModule):
-                module.__dict__
-
     return mod