Fix incompatibility with Python 3.11

ronaldoussoren · Sep 24, 2022 · 4d1b791 · 4d1b791
1 parent 5ab33ae
commit 4d1b791
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 14 deletions.
diff --git a/doc/changelog.rst b/doc/changelog.rst
@@ -1,6 +1,11 @@
 Release history
 ===============
 
+0.19.3
+------
+
+* Fix incompatibility with Python 3.11
+
 0.19.2
 ------
 

diff --git a/modulegraph/__init__.py b/modulegraph/__init__.py
@@ -1 +1 @@
-__version__ = "0.19.2"
+__version__ = "0.19.3"
diff --git a/modulegraph/modulegraph.py b/modulegraph/modulegraph.py
@@ -2209,8 +2209,14 @@ def _replace_paths_in_code(self, co):
             if isinstance(consts[i], type(co)):
                 consts[i] = self._replace_paths_in_code(consts[i])
 
-        code_func = type(co)
 
+        if hasattr(co, "replace"):
+            # New in 3.8
+            return co.replace(
+                co_filename=new_filename,
+                co_consts=tuple(consts))
+
+        code_func = type(co)
         if hasattr(co, "co_posonlyargcount"):
             return code_func(
                 co.co_argcount,

diff --git a/modulegraph_tests/test_imports.py b/modulegraph_tests/test_imports.py
@@ -394,6 +394,7 @@ def setUp(self):
         self.mf = modulegraph.ModuleGraph(path=[ root ] + sys.path)
         self.mf.run_script(os.path.join(root, 'script.py'))
 
+    @unittest.skipUnless(sys.version_info[:2] < (3,11), "Doesn't work with 3.11")
     @unittest.skipUnless(not hasattr(sys, 'real_prefix'), "Test doesn't work in virtualenv")
     def testRegr1(self):
         node = self.mf.findNode('mypkg.distutils')
@@ -402,9 +403,9 @@ def testRegr1(self):
         self.assertIsInstance(node, modulegraph.SourceModule)
         self.assertStartswith(node.filename, os.path.dirname(__file__))
 
-	# The calls to os.path.realpath are needed due to way
+        # The calls to os.path.realpath are needed due to way
         # my (Ronald's) test machine is set up, sys.prefix is
-	# a symlink to make it easier to test both macOS installer 
+        # a symlink to make it easier to test both macOS installer 
         # variants on python.org.
         import distutils.sysconfig, distutils.ccompiler
         node = self.mf.findNode('distutils.ccompiler')

diff --git a/modulegraph_tests/test_version.py b/modulegraph_tests/test_version.py
@@ -8,7 +8,7 @@ def test_package_version(self):
         fn = os.path.join(
             os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
             'setup.cfg')
-        with open(fn, 'rU') as fp:
+        with open(fn, 'r') as fp:
             for ln in fp:
                 if ln.startswith('version'):
                     version = ln.split('=')[-1].strip()

diff --git a/modulegraph_tests/testpkg-setuptools-namespace/src/nspkg.egg-info/PKG-INFO b/modulegraph_tests/testpkg-setuptools-namespace/src/nspkg.egg-info/PKG-INFO
@@ -1,10 +1,3 @@
 Metadata-Version: 2.1
 Name: nspkg
 Version: 1.0
-Summary: UNKNOWN
-Home-page: UNKNOWN
-License: UNKNOWN
-Platform: UNKNOWN
-
-UNKNOWN
-
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [x-metadata]
 name = modulegraph
-version = 0.19.2
+version = 0.19.3
 description = Python module dependency analysis tool
 long_description_file =
   README.rst
@@ -19,6 +19,7 @@ classifiers =
   Programming Language :: Python :: 3.8
   Programming Language :: Python :: 3.9
   Programming Language :: Python :: 3.10
+  Programming Language :: Python :: 3.11
   Topic :: Software Development :: Libraries :: Python Modules
   Topic :: Software Development :: Build Tools
 author = Ronald Oussoren

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = isort,black,py27,py37,py38,py39,py310,flake8,coverage-report
+envlist = isort,black,py27,py37,py38,py39,py310,py311,flake8,coverage-report
 
 [testenv]
 commands = {envbindir}/python -m coverage run --parallel setup.py test --verbosity=3