Use the stdlib importlib.metadata when available (#1024)

* Use the stdlib importlib.metadata when available The use of importlib_metadata relies on features that were introduced in python 3.10. Aside for that, it should be fine to use the stdlib directly. Fixes #773 * Add news fragment. * Import the full email.utils module as used. --------- Co-authored-by: Jason R. Coombs <[email protected]>
pypa · Jun 26, 2024 · 5bf3f38 · 5bf3f38
1 parent e29791d
commit 5bf3f38
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/changelog/1024.misc.rst b/changelog/1024.misc.rst
@@ -0,0 +1 @@
+Only require ``importlib_metadata`` on older Pythons.
diff --git a/twine/__init__.py b/twine/__init__.py
@@ -30,9 +30,13 @@
 
 __copyright__ = "Copyright 2019 Donald Stufft and individual contributors"
 
-import email
+import email.utils
+import sys
 
-import importlib_metadata
+if sys.version_info >= (3, 10):
+    import importlib.metadata as importlib_metadata
+else:
+    import importlib_metadata
 
 metadata = importlib_metadata.metadata("twine")
 

diff --git a/twine/cli.py b/twine/cli.py
@@ -13,9 +13,14 @@
 # limitations under the License.
 import argparse
 import logging.config
+import sys
 from typing import Any, List, Tuple
 
-import importlib_metadata
+if sys.version_info >= (3, 10):
+    import importlib.metadata as importlib_metadata
+else:
+    import importlib_metadata
+
 import rich
 import rich.highlighter
 import rich.logging
@@ -70,14 +75,15 @@ def configure_output() -> None:
 
 
 def list_dependencies_and_versions() -> List[Tuple[str, str]]:
-    deps = (
-        "importlib-metadata",
+    deps = [
         "keyring",
         "pkginfo",
         "requests",
         "requests-toolbelt",
         "urllib3",
-    )
+    ]
+    if sys.version_info < (3, 10):
+        deps.append("importlib-metadata")
     return [(dep, importlib_metadata.version(dep)) for dep in deps]
 
 

diff --git a/twine/package.py b/twine/package.py
@@ -18,9 +18,14 @@
 import os
 import re
 import subprocess
+import sys
 from typing import Any, Dict, List, NamedTuple, Optional, Sequence, Tuple, Union, cast
 
-import importlib_metadata
+if sys.version_info >= (3, 10):
+    import importlib.metadata as importlib_metadata
+else:
+    import importlib_metadata
+
 import pkginfo
 from rich import print