diff options
| author | Steve Kowalik <steven@wedontsleep.org> | 2016-01-07 15:04:10 +1100 |
|---|---|---|
| committer | Steve Kowalik <steven@wedontsleep.org> | 2016-01-07 15:04:10 +1100 |
| commit | 7e1ca274068f946e5eb9cac457718ff37326d3a6 (patch) | |
| tree | 946e3a06815ea81b763811f7a16132117066d3ca | |
| parent | 027ca18211667f9467319d8dc2f0ca1137f86474 (diff) | |
| download | external_python_setuptools-7e1ca274068f946e5eb9cac457718ff37326d3a6.tar.gz external_python_setuptools-7e1ca274068f946e5eb9cac457718ff37326d3a6.tar.bz2 external_python_setuptools-7e1ca274068f946e5eb9cac457718ff37326d3a6.zip | |
Shift packaging to use shiny extern.
| -rw-r--r-- | pkg_resources/_vendor/packaging/markers.py | 6 | ||||
| -rw-r--r-- | pkg_resources/_vendor/packaging/requirements.py | 8 | ||||
| -rw-r--r-- | pkg_resources/extern/__init__.py | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkg_resources/_vendor/packaging/markers.py b/pkg_resources/_vendor/packaging/markers.py index db8f1c25..d5b6ddbe 100644 --- a/pkg_resources/_vendor/packaging/markers.py +++ b/pkg_resources/_vendor/packaging/markers.py @@ -8,9 +8,9 @@ import os import platform import sys -from pkg_resources._vendor.pyparsing import ParseException, ParseResults, stringStart, stringEnd -from pkg_resources._vendor.pyparsing import ZeroOrMore, Group, Forward, QuotedString -from pkg_resources._vendor.pyparsing import Literal as L # noqa +from pkg_resources.extern.pyparsing import ParseException, ParseResults, stringStart, stringEnd +from pkg_resources.extern.pyparsing import ZeroOrMore, Group, Forward, QuotedString +from pkg_resources.extern.pyparsing import Literal as L # noqa from ._compat import string_types from .specifiers import Specifier, InvalidSpecifier diff --git a/pkg_resources/_vendor/packaging/requirements.py b/pkg_resources/_vendor/packaging/requirements.py index 658716c6..8a9cd195 100644 --- a/pkg_resources/_vendor/packaging/requirements.py +++ b/pkg_resources/_vendor/packaging/requirements.py @@ -6,10 +6,10 @@ from __future__ import absolute_import, division, print_function import string import re -from pkg_resources._vendor.pyparsing import stringStart, stringEnd, originalTextFor, ParseException -from pkg_resources._vendor.pyparsing import ZeroOrMore, Word, Optional, Regex, Combine -from pkg_resources._vendor.pyparsing import Literal as L # noqa -from pkg_resources._vendor.six.moves.urllib import parse as urlparse +from pkg_resources.extern.pyparsing import stringStart, stringEnd, originalTextFor, ParseException +from pkg_resources.extern.pyparsing import ZeroOrMore, Word, Optional, Regex, Combine +from pkg_resources.extern.pyparsing import Literal as L # noqa +from pkg_resources.extern.six.moves.urllib import parse as urlparse from .markers import MARKER_EXPR, Marker from .specifiers import LegacySpecifier, Specifier, SpecifierSet diff --git a/pkg_resources/extern/__init__.py b/pkg_resources/extern/__init__.py index 317f4b8d..6758d36f 100644 --- a/pkg_resources/extern/__init__.py +++ b/pkg_resources/extern/__init__.py @@ -67,5 +67,5 @@ class VendorImporter: if self not in sys.meta_path: sys.meta_path.append(self) -names = 'packaging', 'six' +names = 'packaging', 'pyparsing', 'six' VendorImporter(__name__, names).install() |