diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-12-31 16:47:55 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-12-31 16:47:55 -0500 |
| commit | 9b985a9112d9be396adca6a1948076378c70cc34 (patch) | |
| tree | 99e334a9df66bdeeb5a470c4abe65d9c66e0090d /pkg_resources/__init__.py | |
| parent | ddb91c20793d8e5e8a01e0302afeaaba76776741 (diff) | |
| download | python-setuptools-git-9b985a9112d9be396adca6a1948076378c70cc34.tar.gz | |
Use the same technique in pkg_resources, relying on an 'extern' module to resolve the conditional import.
--HG--
branch : feature/issue-229
Diffstat (limited to 'pkg_resources/__init__.py')
| -rw-r--r-- | pkg_resources/__init__.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py index b55e4127..82382962 100644 --- a/pkg_resources/__init__.py +++ b/pkg_resources/__init__.py @@ -87,15 +87,10 @@ try: except ImportError: pass -try: - import pkg_resources._vendor.packaging.version - import pkg_resources._vendor.packaging.specifiers - packaging = pkg_resources._vendor.packaging -except ImportError: - # fallback to naturally-installed version; allows system packagers to - # omit vendored packages. - import packaging.version - import packaging.specifiers + +from pkg_resources.extern import packaging +__import__('pkg_resources.extern.packaging.version') +__import__('pkg_resources.extern.packaging.specifiers') if (3, 0) < sys.version_info < (3, 3): |