diff --git a/elpy/blackutil.py b/elpy/blackutil.py index e09ed417..667d6e48 100644 --- 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 index 96b75502..fdc11737 100644 --- 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")