Merge pull request #2037 from berhoel/master

Replace pkg_resources.parse_version by packaging.version.Version
jorgenschaefer · Jan 9, 2024 · 777e990 · 777e990
2 parents 7ff8ffa + 6a6655e
commit 777e990
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/elpy/blackutil.py b/elpy/blackutil.py
@@ -7,13 +7,18 @@
 from elpy.rpc import Fault
 # in case pkg_resources is not properly installed
 # (see https://github.com/jorgenschaefer/elpy/issues/1674).
+# in case pkg_resources is not properly installed
+# (see https://github.com/jorgenschaefer/elpy/issues/1674).
 try:
-    from pkg_resources import parse_version
+    from packaging.version import Version as parse_version
 except ImportError:  # pragma: no cover
-    def parse_version(*arg, **kwargs):
-        raise Fault("`pkg_resources` could not be imported, "
-                    "please reinstall Elpy RPC virtualenv with"
-                    " `M-x elpy-rpc-reinstall-virtualenv`", code=400)
+    try:
+        from pkg_resources import parse_version
+    except ImportError:  # pragma: no cover
+        def parse_version(*arg, **kwargs):
+            raise Fault("`pkg_resources` could not be imported, "
+                        "please reinstall Elpy RPC virtualenv with"
+                        " `M-x elpy-rpc-reinstall-virtualenv`", code=400)
 
 import os
 

diff --git a/elpy/jedibackend.py b/elpy/jedibackend.py
@@ -18,12 +18,15 @@
 # in case pkg_resources is not properly installed
 # (see https://github.com/jorgenschaefer/elpy/issues/1674).
 try:
-    from pkg_resources import parse_version
+    from packaging.version import Version as parse_version
 except ImportError:  # pragma: no cover
-    def parse_version(*arg, **kwargs):
-        raise Fault("`pkg_resources` could not be imported, "
-                    "please reinstall Elpy RPC virtualenv with"
-                    " `M-x elpy-rpc-reinstall-virtualenv`", code=400)
+    try:
+        from pkg_resources import parse_version
+    except ImportError:  # pragma: no cover
+        def parse_version(*arg, **kwargs):
+            raise Fault("`pkg_resources` could not be imported, "
+                        "please reinstall Elpy RPC virtualenv with"
+                        " `M-x elpy-rpc-reinstall-virtualenv`", code=400)
 JEDISUP17 = parse_version(jedi.__version__) >= parse_version("0.17.0")
 JEDISUP18 = parse_version(jedi.__version__) >= parse_version("0.18.0")