Remove python<3.8 support

.github/workflows/main.yml

@@ -17,16 +17,11 @@ jobs:
         os:
           - ubuntu-20.04
         python-version:
-          # - 2.7
-          # - 3.5
-          - 3.6
-          - 3.7
           - 3.8
           - 3.9
           - "3.10"
           - 3.11
           - 3.12
-          # - pypy-2.7
           - pypy-3.8
           - pypy-3.9
           - pypy-3.10
@@ -55,7 +50,6 @@ jobs:
   #   strategy:
   #     matrix:
   #       python:
-  #         #- {os: ubuntu-20.04,  python-version: 3.7, pyver: py37}
   #         #- {os: ubuntu-20.04,  python-version: 3.8, pyver: py38}
   #         #- {os: ubuntu-20.04,  python-version: 3.9, pyver: py39}
   #         - {os: ubuntu-20.04,  python-version: "3.10", pyver: py310}
@@ -91,16 +85,11 @@ jobs:
         os:
           - macos-latest
         python-version:
-          # - 2.7
-          # - 3.5
-          - 3.6
-          - 3.7
           - 3.8
           - 3.9
           - "3.10"
           - 3.11
           - 3.12
-          # - pypy-2.7
           - pypy-3.8
           - pypy-3.9
           - pypy-3.10
@@ -123,29 +112,6 @@ jobs:
         name: coverage
         path: .coverage.*
 
-  # test_windows_py27:
-  #   name: Test (${{ matrix.os }}, ${{ matrix.python-version }})
-  #   runs-on: ${{ matrix.os }}
-  #   strategy:
-  #     matrix:
-  #       os:
-  #         - windows-latest
-  #       python-version:
-  #         - 2.7
-  #   steps:
-  #   - name: Checkout code
-  #     uses: actions/checkout@v3
-  #   - name: Setup Python ${{ matrix.python-version }}
-  #     uses: actions/setup-python@v4
-  #     with:
-  #       python-version: ${{ matrix.python-version }}
-  #   - name: Update pip
-  #     run: python -m pip install -U pip wheel setuptools
-  #   - name: Install tox
-  #     run: python -m pip install "tox<4.0.0" "tox-gh-actions<3.0.0"
-  #   - name: Test with tox
-  #     run: python -m tox -e py27,py27-without-extensions
-
   test_windows:
     name: Test (${{ matrix.os }}, ${{ matrix.python-version }})
     runs-on: ${{ matrix.os }}
@@ -154,15 +120,11 @@ jobs:
         os:
           - windows-latest
         python-version:
-          # - 3.5
-          - 3.6
-          - 3.7
           - 3.8
           - 3.9
           - "3.10"
           - 3.11
           - 3.12
-          # - pypy-2.7
           - pypy-3.8
           - pypy-3.9
           - pypy-3.10
@@ -278,7 +240,6 @@ jobs:
     needs:
     - test_linux
     - test_macos
-    # - test_windows_py27
     - test_windows
     runs-on: ubuntu-20.04
     steps:

docs/benchmarks.py

@@ -29,7 +29,7 @@ def wrapper4(wrapped, *args, **kwargs):
 def function4():
     pass
 
-class Class(object):
+class Class:
 
     def function1(self):
         pass

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # wrapt documentation build configuration file, created by
 # sphinx-quickstart on Tue Aug 13 20:38:04 2013.
@@ -40,8 +39,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'wrapt'
-copyright = u'2013-2023, Graham Dumpleton'
+project = 'wrapt'
+copyright = '2013-2023, Graham Dumpleton'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -189,8 +188,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'wrapt.tex', u'wrapt Documentation',
-   u'Graham Dumpleton', 'manual'),
+  ('index', 'wrapt.tex', 'wrapt Documentation',
+   'Graham Dumpleton', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -219,8 +218,8 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'wrapt', u'wrapt Documentation',
-     [u'Graham Dumpleton'], 1)
+    ('index', 'wrapt', 'wrapt Documentation',
+     ['Graham Dumpleton'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -233,8 +232,8 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'wrapt', u'wrapt Documentation',
-   u'Graham Dumpleton', 'wrapt', 'One line description of project.',
+  ('index', 'wrapt', 'wrapt Documentation',
+   'Graham Dumpleton', 'wrapt', 'One line description of project.',
    'Miscellaneous'),
 ]
 

src/wrapt/decorators.py

@@ -53,7 +53,7 @@ def exec_(_code_, _globs_=None, _locs_=None):
 class _AdapterFunctionCode(CallableObjectProxy):
 
     def __init__(self, wrapped_code, adapter_code):
-        super(_AdapterFunctionCode, self).__init__(wrapped_code)
+        super().__init__(wrapped_code)
         self._self_adapter_code = adapter_code
 
     @property
@@ -79,7 +79,7 @@ def co_varnames(self):
 class _AdapterFunctionSurrogate(CallableObjectProxy):
 
     def __init__(self, wrapped, adapter):
-        super(_AdapterFunctionSurrogate, self).__init__(wrapped)
+        super().__init__(wrapped)
         self._self_adapter = adapter
 
     @property
@@ -129,7 +129,7 @@ class AdapterWrapper(FunctionWrapper):
 
     def __init__(self, *args, **kwargs):
         adapter = kwargs.pop('adapter')
-        super(AdapterWrapper, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self._self_surrogate = _AdapterFunctionSurrogate(
                 self.__wrapped__, adapter)
         self._self_adapter = adapter
@@ -154,13 +154,13 @@ def __kwdefaults__(self):
     def __signature__(self):
         return self._self_surrogate.__signature__
 
-class AdapterFactory(object):
+class AdapterFactory:
     def __call__(self, wrapped):
         raise NotImplementedError()
 
 class DelegatedAdapterFactory(AdapterFactory):
     def __init__(self, factory):
-        super(DelegatedAdapterFactory, self).__init__()
+        super().__init__()
         self.factory = factory
     def __call__(self, wrapped):
         return self.factory(wrapped)
@@ -226,7 +226,7 @@ def _build(wrapped, wrapper, enabled=None, adapter=None):
                             adapter = adapter[:-1]
                         adapter = formatargspec(*adapter)
 
-                    exec_('def adapter{}: pass'.format(adapter), ns, ns)
+                    exec_(f'def adapter{adapter}: pass', ns, ns)
                     adapter = ns['adapter']
 
                     # Override the annotations for the manufactured

src/wrapt/importer.py

@@ -133,7 +133,7 @@ def load_module(self, fullname):
 class _ImportHookChainedLoader(ObjectProxy):
 
     def __init__(self, loader):
-        super(_ImportHookChainedLoader, self).__init__(loader)
+        super().__init__(loader)
 
         if hasattr(loader, "load_module"):
           self.__self_setattr__('load_module', self._self_load_module)

src/wrapt/patches.py

@@ -68,7 +68,7 @@ def wrap_object(module, name, factory, args=(), kwargs={}):
 # instance attribute. Note that this cannot be used on attributes which
 # are themselves defined by a property object.
 
-class AttributeWrapper(object):
+class AttributeWrapper:
 
     def __init__(self, attribute, factory, args, kwargs):
         self.attribute = attribute

src/wrapt/weakrefs.py

@@ -53,25 +53,25 @@ def __init__(self, wrapped, callback=None):
                     _callback)
 
             if wrapped._self_parent is not None:
-                super(WeakFunctionProxy, self).__init__(
+                super().__init__(
                         weakref.proxy(wrapped._self_parent, _callback))
 
             else:
-                super(WeakFunctionProxy, self).__init__(
+                super().__init__(
                         weakref.proxy(wrapped, _callback))
 
             return
 
         try:
             self._self_instance = weakref.ref(wrapped.__self__, _callback)
 
-            super(WeakFunctionProxy, self).__init__(
+            super().__init__(
                     weakref.proxy(wrapped.__func__, _callback))
 
         except AttributeError:
             self._self_instance = None
 
-            super(WeakFunctionProxy, self).__init__(
+            super().__init__(
                     weakref.proxy(wrapped, _callback))
 
     def __call__(*args, **kwargs):

src/wrapt/wrappers.py

@@ -13,7 +13,7 @@ def with_metaclass(meta, *bases):
     """Create a base class with a metaclass."""
     return meta("NewBase", bases, {})
 
-class _ObjectProxyMethods(object):
+class _ObjectProxyMethods:
 
     # We use properties to override the values of __module__ and
     # __doc__. If we add these in ObjectProxy, the derived class
@@ -495,7 +495,7 @@ class _FunctionWrapperBase(ObjectProxy):
     def __init__(self, wrapped, instance, wrapper, enabled=None,
             binding='function', parent=None):
 
-        super(_FunctionWrapperBase, self).__init__(wrapped)
+        super().__init__(wrapped)
 
         object.__setattr__(self, '_self_instance', instance)
         object.__setattr__(self, '_self_wrapper', wrapper)
@@ -780,5 +780,5 @@ def __init__(self, wrapped, wrapper, enabled=None):
         else:
             binding = 'function'
 
-        super(FunctionWrapper, self).__init__(wrapped, None, wrapper,
+        super().__init__(wrapped, None, wrapper,
                 enabled, binding)

tests/test_adapter.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import unittest
 import inspect
 import types
@@ -140,7 +138,7 @@ def _adapter(self, arg1, arg2, arg3=None, *args, **kwargs): pass
         def _wrapper_1(wrapped, instance, args, kwargs):
             return wrapped(*args, **kwargs)
 
-        class Class1(object):
+        class Class1:
             @_wrapper_1
             def function(self):
                 pass
@@ -156,7 +154,7 @@ def function(self):
         def _wrapper_2(wrapped, instance, args, kwargs):
             return wrapped(*args, **kwargs)
 
-        class Class2(object):
+        class Class2:
             @_wrapper_2
             def function(self):
                 pass
@@ -175,7 +173,7 @@ def _adapter(cls, arg1, arg2, arg3=None, *args, **kwargs): pass
         def _wrapper_1(wrapped, instance, args, kwargs):
             return wrapped(*args, **kwargs)
 
-        class Class1(object):
+        class Class1:
             @_wrapper_1
             @classmethod
             def function(cls):
@@ -192,7 +190,7 @@ def function(cls):
         def _wrapper_2(wrapped, instance, args, kwargs):
             return wrapped(*args, **kwargs)
 
-        class Class2(object):
+        class Class2:
             @_wrapper_2
             @classmethod
             def function(self):

tests/test_adapter_py3.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import inspect
 import unittest
 import types
@@ -148,7 +146,7 @@ def _adapter1(self, arg1, arg2, arg3=None, *args, **kwargs) -> Iterable: pass
         def _wrapper_1(wrapped, instance, args, kwargs):
             return wrapped(*args, **kwargs)
 
-        class Class1(object):
+        class Class1:
             @_wrapper_1
             def function(self):
                 pass
@@ -171,7 +169,7 @@ def _adapter2(self, arg1, arg2, arg3=None, *args, **kwargs) -> int: pass
         def _wrapper_2(wrapped, instance, args, kwargs):
             return wrapped(*args, **kwargs)
 
-        class Class2(object):
+        class Class2:
             @_wrapper_2
             def function(self):
                 pass
@@ -190,7 +188,7 @@ def _adapter1(cls, arg1, arg2, arg3=None, *args, **kwargs) -> Iterable: pass
         def _wrapper_1(wrapped, instance, args, kwargs):
             return wrapped(*args, **kwargs)
 
-        class Class1(object):
+        class Class1:
             @_wrapper_1
             @classmethod
             def function(cls):
@@ -214,7 +212,7 @@ def _adapter2(cls, arg1, arg2, arg3=None, *args, **kwargs) -> int: pass
         def _wrapper_2(wrapped, instance, args, kwargs):
             return wrapped(*args, **kwargs)
 
-        class Class2(object):
+        class Class2:
             @_wrapper_2
             @classmethod
             def function(self):

tests/test_adapter_py33.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import unittest
 import inspect
 import types

tests/test_arguments.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import unittest
 
 import wrapt
@@ -26,5 +24,5 @@ def test_unexpected_unicode_keyword(self):
         def function(a=2):
             pass
 
-        kwargs = { u'b': 40 }
+        kwargs = { 'b': 40 }
         self.assertRaises(TypeError, wrapt.getcallargs, function, **kwargs)

tests/test_attribute_wrapper.py

@@ -1,10 +1,8 @@
-from __future__ import print_function
-
 import unittest
 
 import wrapt
 
-class Class(object):
+class Class:
     def __init__(self, value):
         self.value = value
 

tests/test_callable_object_proxy.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import unittest
 
 import wrapt