diff options
| author | Donald Stufft <donald@stufft.io> | 2014-11-19 13:14:19 -0500 |
|---|---|---|
| committer | Donald Stufft <donald@stufft.io> | 2014-11-19 21:50:23 -0500 |
| commit | 4b8fbbf7f064f170b0e0040f44bb528147ddedc9 (patch) | |
| tree | 30f5640ccc550ed33e6565a504948c40742474b2 /pkg_resources.py | |
| parent | 09ecca34b3eeb76d4f231040338e1c68bf770702 (diff) | |
| download | external_python_setuptools-4b8fbbf7f064f170b0e0040f44bb528147ddedc9.tar.gz external_python_setuptools-4b8fbbf7f064f170b0e0040f44bb528147ddedc9.tar.bz2 external_python_setuptools-4b8fbbf7f064f170b0e0040f44bb528147ddedc9.zip | |
Upgrade packaging to 14.3
Diffstat (limited to 'pkg_resources.py')
| -rw-r--r-- | pkg_resources.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkg_resources.py b/pkg_resources.py index daf7732c..422b31b5 100644 --- a/pkg_resources.py +++ b/pkg_resources.py @@ -77,9 +77,11 @@ except ImportError: try: import packaging.version + import packaging.specifiers except ImportError: # fallback to vendored version import setuptools._vendor.packaging.version + import setuptools._vendor.packaging.specifiers packaging = setuptools._vendor.packaging # For compatibility, expose packaging.version.parse as parse_version @@ -2678,7 +2680,7 @@ class Requirement: """DO NOT CALL THIS UNDOCUMENTED METHOD; use Requirement.parse()!""" self.unsafe_name, project_name = project_name, safe_name(project_name) self.project_name, self.key = project_name, project_name.lower() - self.specifier = packaging.version.Specifier( + self.specifier = packaging.specifiers.SpecifierSet( ",".join(["".join([x, y]) for x, y in specs]) ) self.specs = specs |