Fix Python3.10/3.11 tomli compatibility (#6449)

matteius · web-flow · commit b8e5110ab619 · 2025-12-09T05:58:58.000-05:00
* Fix Python 3.9 compatibility by adding future annotations Add 'from __future__ import annotations' to files in pipenv/patched/pip that use Python 3.10+ type annotation syntax (dict | None, list[str]). This allows the code to work on Python 3.9 by deferring annotation evaluation (PEP 563). Fixes #6448 * fix bad import format from vendoring < py3.11 * try addressing bottle/pypiserver errors
diff --git a/Pipfile b/Pipfile
@@ -28,8 +28,11 @@ pyyaml = "==6.0.1"
 build = "*"
 twine = "*"
 semver = "*"
-pypiserver = "2.3.2"
 zipp = "==3.21.0"
+pypiserver = "*"
+tomli = "*"
+bottle = "*"
+legacy-cgi = {version = "*", markers = "python_version >= '3.13'"}
 
 [packages]
 pytz = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/news/6448.bugfix.rst b/news/6448.bugfix.rst
@@ -0,0 +1,3 @@
+Fix TypeError when using pipenv with Python 3.9 target environments
+by adding ``from __future__ import annotations`` to files in
+``pipenv/patched/pip`` that use Python 3.10+ type annotation syntax.
diff --git a/pipenv/patched/pip/_internal/commands/cache.py b/pipenv/patched/pip/_internal/commands/cache.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 import textwrap
 from optparse import Values
diff --git a/pipenv/patched/pip/_internal/commands/check.py b/pipenv/patched/pip/_internal/commands/check.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 from optparse import Values
 
diff --git a/pipenv/patched/pip/_internal/commands/completion.py b/pipenv/patched/pip/_internal/commands/completion.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import sys
 import textwrap
 from optparse import Values
diff --git a/pipenv/patched/pip/_internal/commands/download.py b/pipenv/patched/pip/_internal/commands/download.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 import os
 from optparse import Values
diff --git a/pipenv/patched/pip/_internal/commands/freeze.py b/pipenv/patched/pip/_internal/commands/freeze.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import sys
 from optparse import Values
 
diff --git a/pipenv/patched/pip/_internal/commands/hash.py b/pipenv/patched/pip/_internal/commands/hash.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import hashlib
 import logging
 import sys
diff --git a/pipenv/patched/pip/_internal/commands/help.py b/pipenv/patched/pip/_internal/commands/help.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from optparse import Values
 
 from pipenv.patched.pip._internal.cli.base_command import Command
diff --git a/pipenv/patched/pip/_internal/commands/inspect.py b/pipenv/patched/pip/_internal/commands/inspect.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 from optparse import Values
 from typing import Any
diff --git a/pipenv/patched/pip/_internal/commands/lock.py b/pipenv/patched/pip/_internal/commands/lock.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import sys
 from optparse import Values
 from pathlib import Path
diff --git a/pipenv/patched/pip/_internal/commands/uninstall.py b/pipenv/patched/pip/_internal/commands/uninstall.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 from optparse import Values
 
diff --git a/pipenv/patched/pip/_internal/commands/wheel.py b/pipenv/patched/pip/_internal/commands/wheel.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 import os
 import shutil
diff --git a/pipenv/patched/pip/_internal/models/installation_report.py b/pipenv/patched/pip/_internal/models/installation_report.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from collections.abc import Sequence
 from typing import Any
 
diff --git a/pipenv/patched/pip/_internal/models/search_scope.py b/pipenv/patched/pip/_internal/models/search_scope.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import itertools
 import logging
 import os
diff --git a/pipenv/patched/pip/_internal/network/utils.py b/pipenv/patched/pip/_internal/network/utils.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from collections.abc import Generator
 
 from pipenv.patched.pip._vendor.requests.models import Response
diff --git a/pipenv/patched/pip/_internal/network/xmlrpc.py b/pipenv/patched/pip/_internal/network/xmlrpc.py
@@ -1,4 +1,5 @@
 """xmlrpclib.Transport implementation"""
+from __future__ import annotations
 
 import logging
 import urllib.parse
diff --git a/pipenv/patched/pip/_internal/req/req_dependency_group.py b/pipenv/patched/pip/_internal/req/req_dependency_group.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from collections.abc import Iterable, Iterator
 from typing import Any
 
diff --git a/pipenv/patched/pip/_internal/req/req_set.py b/pipenv/patched/pip/_internal/req/req_set.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 from collections import OrderedDict
 
diff --git a/pipenv/patched/pip/_internal/resolution/base.py b/pipenv/patched/pip/_internal/resolution/base.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Callable, Optional
 
 from pipenv.patched.pip._internal.req.req_install import InstallRequirement
diff --git a/pipenv/patched/pip/_internal/utils/appdirs.py b/pipenv/patched/pip/_internal/utils/appdirs.py
@@ -5,6 +5,7 @@
 The intention is to rewrite current usages gradually, keeping the tests pass,
 and eventually drop this after all usages are changed.
 """
+from __future__ import annotations
 
 import os
 import sys
diff --git a/pipenv/patched/pip/_internal/utils/filetypes.py b/pipenv/patched/pip/_internal/utils/filetypes.py
@@ -1,4 +1,5 @@
 """Filetype information."""
+from __future__ import annotations
 
 from pipenv.patched.pip._internal.utils.misc import splitext
 
diff --git a/pipenv/patched/pip/_internal/utils/wheel.py b/pipenv/patched/pip/_internal/utils/wheel.py
@@ -1,4 +1,5 @@
 """Support functions for working with wheel files."""
+from __future__ import annotations
 
 import logging
 from email.message import Message
diff --git a/pipenv/patched/pip/_vendor/truststore/_api.py b/pipenv/patched/pip/_vendor/truststore/_api.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import contextlib
 import os
 import platform
diff --git a/pipenv/patched/pip/_vendor/truststore/_macos.py b/pipenv/patched/pip/_vendor/truststore/_macos.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import contextlib
 import ctypes
 import platform
diff --git a/pipenv/patched/pip/_vendor/truststore/_openssl.py b/pipenv/patched/pip/_vendor/truststore/_openssl.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import contextlib
 import os
 import re
diff --git a/pipenv/patched/pip/_vendor/truststore/_windows.py b/pipenv/patched/pip/_vendor/truststore/_windows.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import contextlib
 import ssl
 import typing
diff --git a/pipenv/vendor/pipenv.patched.pip/_internal/utils/compat.py b/pipenv/vendor/pipenv.patched.pip/_internal/utils/compat.py
@@ -70,7 +70,7 @@ def open_text_resource(
 if sys.version_info >= (3, 11):
     import tomllib
 else:
-    from pipenv.patched.pip._vendor import tomli as tomllib
+    import pipenv.patched.pip._vendor.tomli as tomllib
 
 
 # packages in the stdlib that may have installation metadata, but should not be
diff --git a/pipenv/vendor/pipenv.patched.pip/_vendor/dependency_groups/_toml_compat.py b/pipenv/vendor/pipenv.patched.pip/_vendor/dependency_groups/_toml_compat.py
@@ -2,7 +2,7 @@
     import tomllib
 except ImportError:
     try:
-        from pipenv.patched.pip._vendor import tomli as tomllib  # type: ignore[no-redef, unused-ignore]
+        import pipenv.patched.pip._vendor.tomli as tomllib  # type: ignore[no-redef, unused-ignore]
     except ModuleNotFoundError:  # pragma: no cover
         tomllib = None  # type: ignore[assignment, unused-ignore]
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Fix TypeError when using pipenv with Python 3.9 target environments`
	`2`	+by adding ``from __future__ import annotations`` to files in
	`3`	+``pipenv/patched/pip`` that use Python 3.10+ type annotation syntax.
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import annotations`
	`2`	`+`
`1`	`3`	`import os`
`2`	`4`	`import textwrap`
`3`	`5`	`from optparse import Values`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import annotations`
	`2`	`+`
`1`	`3`	`import logging`
`2`	`4`	`from optparse import Values`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import annotations`
	`2`	`+`
`1`	`3`	`import sys`
`2`	`4`	`import textwrap`
`3`	`5`	`from optparse import Values`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+from __future__ import annotations`
	`2`	`+`
`1`	`3`	`import hashlib`
`2`	`4`	`import logging`
`3`	`5`	`import sys`