diff options
Diffstat (limited to 'src/pip/_internal/metadata')
| -rw-r--r-- | src/pip/_internal/metadata/base.py | 8 | ||||
| -rw-r--r-- | src/pip/_internal/metadata/pkg_resources.py | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/pip/_internal/metadata/base.py b/src/pip/_internal/metadata/base.py index 100168b6e..37f9a8232 100644 --- a/src/pip/_internal/metadata/base.py +++ b/src/pip/_internal/metadata/base.py @@ -1,11 +1,13 @@ import logging import re -from typing import Container, Iterator, List, Optional +from typing import Container, Iterator, List, Optional, Union -from pip._vendor.packaging.version import _BaseVersion +from pip._vendor.packaging.version import LegacyVersion, Version from pip._internal.utils.misc import stdlib_pkgs # TODO: Move definition here. +DistributionVersion = Union[LegacyVersion, Version] + logger = logging.getLogger(__name__) @@ -34,7 +36,7 @@ class BaseDistribution: @property def version(self): - # type: () -> _BaseVersion + # type: () -> DistributionVersion raise NotImplementedError() @property diff --git a/src/pip/_internal/metadata/pkg_resources.py b/src/pip/_internal/metadata/pkg_resources.py index 5cd9eaee6..f39a39ebe 100644 --- a/src/pip/_internal/metadata/pkg_resources.py +++ b/src/pip/_internal/metadata/pkg_resources.py @@ -3,13 +3,13 @@ from typing import Iterator, List, Optional from pip._vendor import pkg_resources from pip._vendor.packaging.utils import canonicalize_name -from pip._vendor.packaging.version import _BaseVersion +from pip._vendor.packaging.version import parse as parse_version from pip._internal.utils import misc # TODO: Move definition here. from pip._internal.utils.packaging import get_installer from pip._internal.utils.wheel import pkg_resources_distribution_for_wheel -from .base import BaseDistribution, BaseEnvironment +from .base import BaseDistribution, BaseEnvironment, DistributionVersion class Distribution(BaseDistribution): @@ -44,8 +44,8 @@ class Distribution(BaseDistribution): @property def version(self): - # type: () -> _BaseVersion - return self._dist.parsed_version + # type: () -> DistributionVersion + return parse_version(self._dist.version) @property def installer(self): |