Merge branch 'main' into maintain-2.1.x

Author: RonnyPfannschmidt

.github/workflows/pre-commit.yml

@@ -9,6 +9,6 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
-    - uses: pre-commit/[email protected].0
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v3
+    - uses: pre-commit/[email protected].3

.github/workflows/pythonapp.yml

@@ -16,18 +16,18 @@ jobs:
     runs-on: ubuntu-latest
     name: Python sdist/wheel
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-python@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v3
       with:
-        python-version: "3.9"
+        python-version: "3.10"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install --upgrade wheel setuptools build
 
     - name: Build package
       run: python -m build -o dist/
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: dist
         path: dist
@@ -38,27 +38,27 @@ jobs:
     strategy:
       matrix:
         # todo: extract from source
-        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10-dev"]
+        python-version: [3.7, 3.8, 3.9, "3.10", "3.11-dev"]
         install-from: ["dist/*.whl"]
         include:
-        - python-version: 3.9
+        - python-version: "3.10"
           install-from: "-e ."
-        - python-version: 3.9
+        - python-version: "3.10"
           install-from: "."
-        - python-version: 3.9
+        - python-version: "3.10"
           install-from: "dist/*.tar.gz"
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install -U setuptools setuptools_scm
         pip install pytest
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
       with:
         name: dist
         path: dist
@@ -72,10 +72,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: [dist]
     steps:
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v3
       with:
-        python-version: "3.9"
-    - uses: actions/download-artifact@v2
+        python-version: "3.10"
+    - uses: actions/download-artifact@v3
       with:
         name: dist
         path: dist
@@ -87,7 +87,7 @@ jobs:
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
     needs: [dist_check, test]
     steps:
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
       with:
         name: dist
         path: dist

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
 -   repo: https://github.com/psf/black
-    rev: 20.8b1
+    rev: 22.3.0
     hooks:
     -   id: black
         args: [--safe, --quiet]
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+    rev: v4.2.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
@@ -15,23 +15,22 @@ repos:
     -   id: debug-statements
         language_version: python3
 -   repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.4
+    rev: 3.9.2
     hooks:
     -   id: flake8
         language_version: python3
         additional_dependencies:
           - flake8-typing-imports==1.9.0
 -   repo: https://github.com/asottile/reorder_python_imports
-    rev: v2.3.6
+    rev: v3.1.0
     hooks:
     -   id: reorder-python-imports
         args: ['--application-directories=.:src']
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v2.8.0
+    rev: v2.32.1
     hooks:
     -   id: pyupgrade
 -   repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v1.16.0
+    rev: v1.20.1
     hooks:
     -   id: setup-cfg-fmt
-        args: [--min-py3-version=3.4]

README.rst

@@ -3,7 +3,7 @@ Welcome to apipkg !
 
 With apipkg you can control the exported namespace of a Python package and
 greatly reduce the number of imports for your users.
-It is a `small pure Python module`_ that works on CPython 2.7 and 3.4+,
+It is a `small pure Python module`_ that works on CPython 3.7+,
 Jython and PyPy. It cooperates well with Python's ``help()`` system,
 custom importers (PEP302) and common command-line completion tools.
 
@@ -15,8 +15,9 @@ Tutorial example
 -------------------
 
 Here is a simple ``mypkg`` package that specifies one namespace
-and exports two objects imported from different modules::
+and exports two objects imported from different modules:
 
+.. code-block:: python
 
     # mypkg/__init__.py
     import apipkg
@@ -37,7 +38,9 @@ regular Python package.
 Namespace dictionaries contain ``name: value`` mappings
 where the value may be another namespace dictionary or
 a string specifying an import location.  On accessing
-an namespace attribute an import will be performed::
+an namespace attribute an import will be performed:
+
+.. code-block:: pycon
 
     >>> import mypkg
     >>> mypkg.path
@@ -55,7 +58,9 @@ loaded when they are accessed.   This means:
 * only the root "mypkg" ever needs to be imported to get
   access to the complete functionality
 
-* the underlying modules are also accessible, for example::
+* the underlying modules are also accessible, for example:
+
+.. code-block:: python
 
     from mypkg.sub import Class1
 

setup.cfg

@@ -23,24 +23,22 @@ classifiers =
     Operating System :: Microsoft :: Windows
     Operating System :: POSIX
     Programming Language :: Python
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
-    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Programming Language :: Python :: Implementation :: CPython
     Topic :: Software Development :: Libraries
 
 [options]
 packages = find:
-python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
+python_requires = >=3.7
 package_dir = =src
 setup_requires =
     setuptools>=30.3.0
-    setuptools_scm
+    setuptools-scm
 
 [options.packages.find]
 where = src

src/apipkg/__init__.py

@@ -5,22 +5,15 @@
 
 (c) holger krekel, 2009 - MIT license
 """
+import functools
 import os
 import sys
+import threading
 from types import ModuleType
 
-# Prior to Python 3.7 threading support was optional
-try:
-    import threading
-except ImportError:
-    threading = None
-else:
-    import functools
-
 from .version import version as __version__  # NOQA:F401
 
 
-_PY2 = sys.version_info[0] == 2
 _PRESERVED_MODULE_ATTRS = {
     "__file__",
     "__version__",
@@ -59,14 +52,11 @@ def distribution_version(name):
 
 
 def initpkg(pkgname, exportdefs, attr=None, eager=False):
-    """ initialize given package from the export definitions. """
+    """initialize given package from the export definitions."""
     attr = attr or {}
     mod = sys.modules.get(pkgname)
 
-    if _PY2:
-        mod = _initpkg_py2(mod, pkgname, exportdefs, attr=attr)
-    else:
-        mod = _initpkg_py3(mod, pkgname, exportdefs, attr=attr)
+    mod = _initpkg(mod, pkgname, exportdefs, attr=attr)
 
     # eagerload in bypthon to avoid their monkeypatching breaking packages
     if "bpython" in sys.modules or eager:
@@ -77,40 +67,8 @@ def initpkg(pkgname, exportdefs, attr=None, eager=False):
     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.
+def _initpkg(mod, pkgname, exportdefs, attr=None):
+    """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
@@ -197,7 +155,7 @@ def __init__(self, name, importspec, implprefix=None, attr=None):
                 setattr(self, name, val)
         for name, importspec in importspec.items():
             if isinstance(importspec, dict):
-                subname = "{}.{}".format(self.__name__, name)
+                subname = f"{self.__name__}.{name}"
                 apimod = ApiModule(subname, importspec, implprefix)
                 sys.modules[subname] = apimod
                 setattr(self, name, apimod)
@@ -209,7 +167,7 @@ def __init__(self, name, importspec, implprefix=None, attr=None):
                     modpath = implprefix + modpath
 
                 if not attrname:
-                    subname = "{}.{}".format(self.__name__, name)
+                    subname = f"{self.__name__}.{name}"
                     apimod = AliasModule(subname, modpath)
                     sys.modules[subname] = apimod
                     if "." not in name:
@@ -225,7 +183,7 @@ def __repr__(self):
             repr_list.append("from " + repr(self.__file__))
         if repr_list:
             return "<ApiModule {!r} {}>".format(self.__name__, " ".join(repr_list))
-        return "<ApiModule {!r}>".format(self.__name__)
+        return f"<ApiModule {self.__name__!r}>"
 
     @_synchronized
     def __makeattr(self, name, isgetattr=False):
@@ -252,7 +210,7 @@ def __makeattr(self, name, isgetattr=False):
             # * Only call __getattribute__ if there is a possibility something has set
             #   the attribute we're looking for since __getattr__ was called
             if threading is not None and isgetattr:
-                return super(ApiModule, self).__getattribute__(name)
+                return super().__getattribute__(name)
             raise AttributeError(name)
         else:
             result = importobj(modpath, attrname)
@@ -294,7 +252,7 @@ def getmod():
         return mod[0]
 
     x = modpath + ("." + attrname if attrname else "")
-    repr_result = "<AliasModule {!r} for {!r}>".format(modname, x)
+    repr_result = f"<AliasModule {modname!r} for {x!r}>"
 
     class AliasModule(ModuleType):
         def __repr__(self):