Update Python version support.

Author: icemac

src/ComputedAttribute/tests.py

@@ -97,6 +97,7 @@ def test_compilation(self):
         from ExtensionClass import _IS_PYPY
         try:
             from ComputedAttribute import _ComputedAttribute
+        # ModuleNotFoundError is not possible here:
         except ImportError:  # pragma: no cover
             self.assertTrue(_IS_PYPY)
         else:

src/ExtensionClass/__init__.py

@@ -355,5 +355,5 @@ class NoInstanceDictionaryBase(Base):
 # macro from ExtensionClass.h doesn't break with an AttributeError
 try:
     from ._ExtensionClass import CAPI2  # noqa: F401 import unused
-except ImportError:  # pragma: no cover
+except ModuleNotFoundError:  # pragma: no cover
     pass

src/ExtensionClass/_compat.h

@@ -47,15 +47,6 @@
 #  define _PyObject_CAST(op) ((PyObject*)(op))
 #endif
 
-#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_TYPE)
-static inline void
-_Py_SET_TYPE(PyObject *ob, PyTypeObject *type)
-{
-    ob->ob_type = type;
-}
-#define Py_SET_TYPE(ob, type) _Py_SET_TYPE(_PyObject_CAST(ob), type)
-#endif
-
 #ifdef PYTHONCAPI_COMPAT_MSC_INLINE
 #  undef inline
 #  undef PYTHONCAPI_COMPAT_MSC_INLINE

src/ExtensionClass/tests.py

@@ -13,7 +13,6 @@
 ##############################################################################
 
 
-import sys
 import unittest
 from doctest import DocTestSuite
 
@@ -999,8 +998,7 @@ class _Derived(_Base):
         already = object()
         mro = [already]
         self._callFUT(mro, _Derived)
-        self.assertEqual(mro, [already, _Derived, _Base] +
-                         ([object] if sys.version_info[0] > 2 else []))
+        self.assertEqual(mro, [already, _Derived, _Base, object])
 
 
 class TestExtensionClass(unittest.TestCase):
@@ -1012,6 +1010,7 @@ def test_compilation(self):
         from ExtensionClass import _IS_PYPY
         try:
             from ExtensionClass import _ExtensionClass
+        # ModuleNotFoundError is not possible here:
         except ImportError:  # pragma: no cover
             self.assertTrue(_IS_PYPY)
         else:

src/MethodObject/tests.py

@@ -21,6 +21,7 @@ def test_compilation(self):
         from ExtensionClass import _IS_PYPY
         try:
             from MethodObject import _MethodObject
+        # ModuleNotFoundError is not possible here:
         except ImportError:  # pragma: no cover
             self.assertTrue(_IS_PYPY)
         else: