Realign pip/_vendor with vendor.txt

pip/_vendor/appdirs.py

@@ -10,7 +10,7 @@
 # Dev Notes:
 # - MSDN on where to store app data files:
 #   http://support.microsoft.com/default.aspx?scid=kb;en-us;310294#XSLTH3194121123120121120120
-# - macOS: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/index.html
+# - Mac OS X: http://developer.apple.com/documentation/MacOSX/Conceptual/BPFileSystem/index.html
 # - XDG spec for Un*x: http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
 
 __version_info__ = (1, 4, 0)
@@ -30,7 +30,7 @@
     os_name = platform.java_ver()[3][0]
     if os_name.startswith('Windows'): # "Windows XP", "Windows 7", etc.
         system = 'win32'
-    elif os_name.startswith('Mac'): # "macOS", etc.
+    elif os_name.startswith('Mac'): # "Mac OS X", etc.
         system = 'darwin'
     else: # "Linux", "SunOS", "FreeBSD", etc.
         # Setting this to "linux2" is not ideal, but only Windows or Mac
@@ -64,7 +64,7 @@ def user_data_dir(appname=None, appauthor=None, version=None, roaming=False):
             for a discussion of issues.
 
     Typical user data directories are:
-        macOS:                  ~/Library/Application Support/<AppName>
+        Mac OS X:               ~/Library/Application Support/<AppName>
         Unix:                   ~/.local/share/<AppName>    # or in $XDG_DATA_HOME, if defined
         Win XP (not roaming):   C:\Documents and Settings\<username>\Application Data\<AppAuthor>\<AppName>
         Win XP (roaming):       C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>
@@ -118,7 +118,7 @@ def site_data_dir(appname=None, appauthor=None, version=None, multipath=False):
             if XDG_DATA_DIRS is not set
 
     Typical user data directories are:
-        macOS:      /Library/Application Support/<AppName>
+        Mac OS X:   /Library/Application Support/<AppName>
         Unix:       /usr/local/share/<AppName> or /usr/share/<AppName>
         Win XP:     C:\Documents and Settings\All Users\Application Data\<AppAuthor>\<AppName>
         Vista:      (Fail! "C:\ProgramData" is a hidden *system* directory on Vista.)
@@ -185,7 +185,7 @@ def user_config_dir(appname=None, appauthor=None, version=None, roaming=False):
             for a discussion of issues.
 
     Typical user data directories are:
-        macOS:                  same as user_data_dir
+        Mac OS X:               same as user_data_dir
         Unix:                   ~/.config/<AppName>     # or in $XDG_CONFIG_HOME, if defined
         Win *:                  same as user_data_dir
 
@@ -223,7 +223,7 @@ def site_config_dir(appname=None, appauthor=None, version=None, multipath=False)
             returned, or '/etc/xdg/<AppName>', if XDG_CONFIG_DIRS is not set
 
     Typical user data directories are:
-        macOS:      same as site_data_dir
+        Mac OS X:   same as site_data_dir
         Unix:       /etc/xdg/<AppName> or $XDG_CONFIG_DIRS[i]/<AppName> for each value in
                     $XDG_CONFIG_DIRS
         Win *:      same as site_data_dir
@@ -273,7 +273,7 @@ def user_cache_dir(appname=None, appauthor=None, version=None, opinion=True):
             discussion below.
 
     Typical user cache directories are:
-        macOS:      ~/Library/Caches/<AppName>
+        Mac OS X:   ~/Library/Caches/<AppName>
         Unix:       ~/.cache/<AppName> (XDG default)
         Win XP:     C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>\Cache
         Vista:      C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>\Cache
@@ -330,7 +330,7 @@ def user_log_dir(appname=None, appauthor=None, version=None, opinion=True):
             base cache dir for Unix. See discussion below.
 
     Typical user cache directories are:
-        macOS:      ~/Library/Logs/<AppName>
+        Mac OS X:   ~/Library/Logs/<AppName>
         Unix:       ~/.cache/<AppName>/log  # or under $XDG_CACHE_HOME if defined
         Win XP:     C:\Documents and Settings\<username>\Local Settings\Application Data\<AppAuthor>\<AppName>\Logs
         Vista:      C:\Users\<username>\AppData\Local\<AppAuthor>\<AppName>\Logs

pip/_vendor/distlib/_backport/sysconfig.py

@@ -528,7 +528,7 @@ def get_config_vars(*args):
             major_version = int(kernel_version.split('.')[0])
 
             if major_version < 8:
-                # On macOS before 10.4, check if -arch and -isysroot
+                # On Mac OS X before 10.4, check if -arch and -isysroot
                 # are in CFLAGS or LDFLAGS and remove them if they are.
                 # This is needed when building extensions on a 10.3 system
                 # using a universal build of python.

pip/_vendor/distlib/util.py

@@ -161,7 +161,7 @@ def in_venv():
 def get_executable():
 # The __PYVENV_LAUNCHER__ dance is apparently no longer needed, as
 # changes to the stub launcher mean that sys.executable always points
-# to the stub on macOS
+# to the stub on OS X
 #    if sys.platform == 'darwin' and ('__PYVENV_LAUNCHER__'
 #                                     in os.environ):
 #        result =  os.environ['__PYVENV_LAUNCHER__']

pip/_vendor/html5lib/__init__.py

@@ -6,7 +6,7 @@
 
 Example usage:
 
-import html5lib
+from pip._vendor import html5lib
 f = open("my_document.html")
 tree = html5lib.parse(f)
 """

pip/_vendor/html5lib/filters/alphabeticalattributes.py

@@ -5,7 +5,7 @@
 try:
     from collections import OrderedDict
 except ImportError:
-    from ordereddict import OrderedDict
+    from pip._vendor.ordereddict import OrderedDict
 
 
 class Filter(base.Filter):

pip/_vendor/html5lib/treewalkers/etree.py

@@ -4,7 +4,7 @@
     from collections import OrderedDict
 except ImportError:
     try:
-        from ordereddict import OrderedDict
+        from pip._vendor.ordereddict import OrderedDict
     except ImportError:
         OrderedDict = dict
 

pip/_vendor/packaging/markers.py

@@ -8,9 +8,7 @@
 import platform
 import sys
 
-from pip._vendor.pyparsing import (
-    ParseException, ParseResults, stringStart, stringEnd,
-)
+from pip._vendor.pyparsing import ParseException, ParseResults, stringStart, stringEnd
 from pip._vendor.pyparsing import ZeroOrMore, Group, Forward, QuotedString
 from pip._vendor.pyparsing import Literal as L  # noqa
 

pip/_vendor/packaging/requirements.py

@@ -6,9 +6,7 @@
 import string
 import re
 
-from pip._vendor.pyparsing import (
-    stringStart, stringEnd, originalTextFor, ParseException
-)
+from pip._vendor.pyparsing import stringStart, stringEnd, originalTextFor, ParseException
 from pip._vendor.pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
 from pip._vendor.pyparsing import Literal as L  # noqa
 from pip._vendor.six.moves.urllib import parse as urlparse

pip/_vendor/pkg_resources/__init__.py

@@ -74,7 +74,6 @@
 __import__('pip._vendor.packaging.requirements')
 __import__('pip._vendor.packaging.markers')
 
-
 if (3, 0) < sys.version_info < (3, 3):
     msg = (
         "Support for Python 3.0-3.2 has been dropped. Future versions "

pip/_vendor/pyparsing.py

@@ -36,7 +36,7 @@
 (L{'+'<ParserElement.__add__>} operator gives L{And} expressions, strings are auto-converted to
 L{Literal} expressions)::
 
-    from pyparsing import Word, alphas
+    from pip._vendor.pyparsing import Word, alphas
 
     # define grammar of a greeting
     greet = Word(alphas) + "," + Word(alphas) + "!"
@@ -86,7 +86,7 @@ class names, and the use of '+', '|' and '^' operators.
     from collections import OrderedDict as _OrderedDict
 except ImportError:
     try:
-        from ordereddict import OrderedDict as _OrderedDict
+        from pip._vendor.ordereddict import OrderedDict as _OrderedDict
     except ImportError:
         _OrderedDict = None
 
@@ -1557,7 +1557,7 @@ def enablePackrat(cache_size_limit=128):
            after importing pyparsing.
 
            Example::
-               import pyparsing
+               from pip._vendor import pyparsing
                pyparsing.ParserElement.enablePackrat()
         """
         if not ParserElement._packratEnabled:

pip/_vendor/requests/packages/urllib3/contrib/pyopenssl.py

@@ -64,7 +64,7 @@
 
 import ssl
 import select
-import six
+from pip._vendor import six
 
 from .. import connection
 from .. import util

pip/_vendor/requests/utils.py

@@ -581,7 +581,7 @@ def should_bypass_proxies(url):
 
     # If the system proxy settings indicate that this URL should be bypassed,
     # don't proxy.
-    # The proxy_bypass function is incredibly buggy on macOS in early versions
+    # The proxy_bypass function is incredibly buggy on OS X in early versions
     # of Python 2.6, so allow this call to fail. Only catch the specific
     # exceptions we've seen, though: this call failing in other ways can reveal
     # legitimate problems.