summaryrefslogtreecommitdiff
path: root/pkg_resources/_vendor
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2018-03-17 14:10:32 -0400
committerJason R. Coombs <jaraco@jaraco.com>2018-03-17 14:10:32 -0400
commit929acc4e551448a68411968fb50336ad51ed4d3c (patch)
tree6eb60f4a8825bd6180746a984c423b15a5d57281 /pkg_resources/_vendor
parentd0f7a33daba39f60aa402c094cd4276b8b6ce462 (diff)
downloadpython-setuptools-git-929acc4e551448a68411968fb50336ad51ed4d3c.tar.gz
Setuptools now vendors its own direct dependencies (packaging, six, pyparsing). Ref #1296.
Diffstat (limited to 'pkg_resources/_vendor')
-rw-r--r--pkg_resources/_vendor/packaging/markers.py6
-rw-r--r--pkg_resources/_vendor/packaging/requirements.py8
2 files changed, 7 insertions, 7 deletions
diff --git a/pkg_resources/_vendor/packaging/markers.py b/pkg_resources/_vendor/packaging/markers.py
index 892e578e..a4805648 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.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 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 0c8c4a38..ccaed95b 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.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 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