Prefer importlib_metadata for entrypoint parsing. (#728)

jaraco · bhrutledge · web-flow · commit 7e95990430a2 · 2021-02-21T15:19:53.000-05:00
* Prefer importlib_metadata for entrypoint parsing.

* Prefer dict comprehension for now.

* Workaround "implicit reexport disabled"

* Add changelog.

Co-authored-by: Brian Rutledge &lt;brian@bhrutledge.com&gt;
diff --git a/changelog/728.feature.rst b/changelog/728.feature.rst
@@ -0,0 +1 @@
+Prefer importlib.metadata for entry point handling.
diff --git a/twine/__init__.py b/twine/__init__.py
@@ -29,7 +29,9 @@
 if sys.version_info[:2] >= (3, 8):
     from importlib import metadata as importlib_metadata
 else:
-    import importlib_metadata
+    # Using `as` to workaround "implicit reexport disabled"
+    # https://mypy.readthedocs.io/en/stable/config_file.html#confval-implicit_reexport
+    import importlib_metadata as importlib_metadata
 
 
 metadata = importlib_metadata.metadata("twine")
diff --git a/twine/cli.py b/twine/cli.py
@@ -14,7 +14,6 @@
 import argparse
 from typing import Any, Dict, List, Tuple
 
-import pkg_resources
 import pkginfo
 import requests
 import requests_toolbelt
@@ -23,15 +22,17 @@
 
 import twine
 from twine import _installed
+from twine import importlib_metadata
 
 args = argparse.Namespace()
 
 
 def _registered_commands(
     group: str = "twine.registered_commands",
-) -> Dict[str, pkg_resources.EntryPoint]:
-    registered_commands = pkg_resources.iter_entry_points(group=group)
-    return {c.name: c for c in registered_commands}
+) -> Dict[str, importlib_metadata.EntryPoint]:
+    # todo: with python/importlib_metadata#278:
+    # return importlib_metadata.entry_points()[group]
+    return {ep.name: ep for ep in importlib_metadata.entry_points()[group]}
 
 
 def list_dependencies_and_versions() -> List[Tuple[str, str]]:

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Prefer importlib.metadata for entry point handling.`