Upgrade requests

Author: dstufft

news/certifi.vendor

@@ -0,0 +1 @@
+Vendored certifi at 2017.7.27.1.

news/chardet.vendor

@@ -0,0 +1 @@
+Vendored chardet at 3.0.4.

news/idna.vendor

@@ -0,0 +1 @@
+Vendored idna at idna==2.6.

news/requests.vendor

@@ -1 +1 @@
-Upgraded requests to 2.14.2.
+Upgraded requests to 2.18.4.

news/urllib3.vendor

@@ -0,0 +1 @@
+Vendored urllib3 at 1.22.

src/pip/_internal/__init__.py

@@ -17,7 +17,7 @@
 # to add socks as yet another dependency for pip, nor do I want to allow-stder
 # in the DEP-8 tests, so just suppress the warning.  pdb tells me this has to
 # be done before the import of pip.vcs.
-from pip._vendor.requests.packages.urllib3.exceptions import DependencyWarning
+from pip._vendor.urllib3.exceptions import DependencyWarning
 warnings.filterwarnings("ignore", category=DependencyWarning)  # noqa
 
 # We want to inject the use of SecureTransport as early as possible so that any
@@ -32,9 +32,7 @@
     if (sys.platform == "darwin" and
             ssl.OPENSSL_VERSION_NUMBER < 0x1000100f):  # OpenSSL 1.0.1
         try:
-            from pip._vendor.requests.packages.urllib3.contrib import (
-                securetransport,
-            )
+            from pip._vendor.urllib3.contrib import securetransport
         except (ImportError, OSError):
             pass
         else:
@@ -51,9 +49,7 @@
 )
 from pip._internal.commands import get_summaries, get_similar_commands
 from pip._internal.commands import commands_dict
-from pip._vendor.requests.packages.urllib3.exceptions import (
-    InsecureRequestWarning,
-)
+from pip._vendor.urllib3.exceptions import InsecureRequestWarning
 
 logger = logging.getLogger(__name__)
 

src/pip/_internal/download.py

@@ -12,14 +12,13 @@
 import shutil
 import sys
 
-from pip._vendor import requests, six
+from pip._vendor import requests, six, urllib3
 from pip._vendor.cachecontrol import CacheControlAdapter
 from pip._vendor.cachecontrol.caches import FileCache
 from pip._vendor.lockfile import LockError
 from pip._vendor.requests.adapters import BaseAdapter, HTTPAdapter
 from pip._vendor.requests.auth import AuthBase, HTTPBasicAuth
 from pip._vendor.requests.models import CONTENT_CHUNK_SIZE, Response
-from pip._vendor.requests.packages import urllib3
 from pip._vendor.requests.structures import CaseInsensitiveDict
 from pip._vendor.requests.utils import get_netrc_auth
 # NOTE: XMLRPC Client is not annotated in typeshed as on 2017-07-17, which is

src/pip/_vendor/cachecontrol/compat.py

@@ -10,8 +10,17 @@
     import pickle
 
 
-from pip._vendor.requests.packages.urllib3.response import HTTPResponse
-from pip._vendor.requests.packages.urllib3.util import is_fp_closed
+# Handle the case where the requests module has been patched to not have
+# urllib3 bundled as part of its source.
+try:
+    from pip._vendor.requests.packages.urllib3.response import HTTPResponse
+except ImportError:
+    from pip._vendor.urllib3.response import HTTPResponse
+
+try:
+    from pip._vendor.requests.packages.urllib3.util import is_fp_closed
+except ImportError:
+    from pip._vendor.urllib3.util import is_fp_closed
 
 # Replicate some six behaviour
 try:

src/pip/_vendor/certifi.pyi

@@ -0,0 +1 @@
+from certifi import *

src/pip/_vendor/certifi/__init__.py

@@ -0,0 +1,3 @@
+from .core import where, old_where
+
+__version__ = "2017.07.27.1"

src/pip/_vendor/certifi/__main__.py

@@ -0,0 +1,2 @@
+from certifi import where
+print(where())

src/pip/_vendor/requests/cacert.pem renamed to src/pip/_vendor/certifi/cacert.pem

@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+certifi.py
+~~~~~~~~~~
+
+This module returns the installation location of cacert.pem.
+"""
+import os
+import warnings
+
+
+class DeprecatedBundleWarning(DeprecationWarning):
+    """
+    The weak security bundle is being deprecated. Please bother your service
+    provider to get them to stop using cross-signed roots.
+    """
+
+
+def where():
+    f = os.path.dirname(__file__)
+
+    return os.path.join(f, 'cacert.pem')
+
+
+def old_where():
+    warnings.warn(
+        "The weak security bundle is being deprecated.",
+        DeprecatedBundleWarning
+    )
+    f = os.path.dirname(__file__)
+    return os.path.join(f, 'weak.pem')
+
+if __name__ == '__main__':
+    print(where())

src/pip/_vendor/certifi/core.py

@@ -0,0 +1 @@
+from chardet import *

src/pip/_vendor/certifi/old_root.pem

@@ -18,9 +18,9 @@
 import argparse
 import sys
 
-from chardet import __version__
-from chardet.compat import PY2
-from chardet.universaldetector import UniversalDetector
+from pip._vendor.chardet import __version__
+from pip._vendor.chardet.compat import PY2
+from pip._vendor.chardet.universaldetector import UniversalDetector
 
 
 def description_of(lines, name='stdin'):

src/pip/_vendor/certifi/weak.pem

@@ -40,6 +40,7 @@ class a user of ``chardet`` should use.
 import logging
 import re
 
+from .charsetgroupprober import CharSetGroupProber
 from .enums import InputState, LanguageFilter, ProbingState
 from .escprober import EscCharSetProber
 from .latin1prober import Latin1Prober
@@ -268,11 +269,18 @@ def close(self):
         if self.logger.getEffectiveLevel() == logging.DEBUG:
             if self.result['encoding'] is None:
                 self.logger.debug('no probers hit minimum threshold')
-                for prober in self._charset_probers[0].probers:
-                    if not prober:
+                for group_prober in self._charset_probers:
+                    if not group_prober:
                         continue
-                    self.logger.debug('%s %s confidence = %s',
-                                      prober.charset_name,
-                                      prober.language,
-                                      prober.get_confidence())
+                    if isinstance(group_prober, CharSetGroupProber):
+                        for prober in group_prober.probers:
+                            self.logger.debug('%s %s confidence = %s',
+                                              prober.charset_name,
+                                              prober.language,
+                                              prober.get_confidence())
+                    else:
+                        self.logger.debug('%s %s confidence = %s',
+                                          prober.charset_name,
+                                          prober.language,
+                                          prober.get_confidence())
         return self.result

src/pip/_vendor/chardet.pyi

@@ -5,5 +5,5 @@
 :author: Dan Blanchard ([email protected])
 """
 
-__version__ = "3.0.2"
+__version__ = "3.0.4"
 VERSION = __version__.split('.')

src/pip/_vendor/requests/packages/chardet/__init__.py renamed to src/pip/_vendor/chardet/__init__.py

@@ -489,7 +489,7 @@ def determineEncoding(self, chardet=True):
         # Guess with chardet, if available
         if chardet:
             try:
-                from chardet.universaldetector import UniversalDetector
+                from pip._vendor.chardet.universaldetector import UniversalDetector
             except ImportError:
                 pass
             else:

src/pip/_vendor/requests/packages/chardet/big5freq.py renamed to src/pip/_vendor/chardet/big5freq.py

@@ -0,0 +1 @@
+from idna import *

src/pip/_vendor/requests/packages/chardet/big5prober.py renamed to src/pip/_vendor/chardet/big5prober.py

@@ -0,0 +1,2 @@
+from .package_data import __version__
+from .core import *

src/pip/_vendor/requests/packages/chardet/chardistribution.py renamed to src/pip/_vendor/chardet/chardistribution.py

@@ -1,5 +1,6 @@
-# This file is automatically generated by build-idnadata.py
+# This file is automatically generated by tools/idna-data
 
+__version__ = "6.3.0"
 scripts = {
     'Greek': (
         0x37000000374,

src/pip/_vendor/requests/packages/chardet/charsetgroupprober.py renamed to src/pip/_vendor/chardet/charsetgroupprober.py

@@ -0,0 +1,2 @@
+__version__ = '2.6'
+

src/pip/_vendor/requests/packages/chardet/charsetprober.py renamed to src/pip/_vendor/chardet/charsetprober.py

@@ -1,9 +1,10 @@
-# This file is automatically generated by tools/build-uts46data.py
+# This file is automatically generated by tools/idna-data
 # vim: set fileencoding=utf-8 :
 
 """IDNA Mapping Table from UTS46."""
 
 
+__version__ = "6.3.0"
 def _seg_0():
     return [
     (0x0, '3'),

src/pip/_vendor/requests/packages/chardet/cli/__init__.py renamed to src/pip/_vendor/chardet/cli/__init__.py

@@ -6,7 +6,7 @@
 #          /
 
 """
-Requests HTTP library
+Requests HTTP Library
 ~~~~~~~~~~~~~~~~~~~~~
 
 Requests is an HTTP library, written in Python, for human beings. Basic GET
@@ -36,33 +36,68 @@
 The other HTTP methods are supported - see `requests.api`. Full documentation
 is at <http://python-requests.org>.
 
-:copyright: (c) 2016 by Kenneth Reitz.
+:copyright: (c) 2017 by Kenneth Reitz.
 :license: Apache 2.0, see LICENSE for more details.
 """
 
-__title__ = 'requests'
-__version__ = '2.14.2'
-__build__ = 0x021402
-__author__ = 'Kenneth Reitz'
-__license__ = 'Apache 2.0'
-__copyright__ = 'Copyright 2016 Kenneth Reitz'
+from pip._vendor import urllib3
+from pip._vendor import chardet
+import warnings
+from .exceptions import RequestsDependencyWarning
+
+
+def check_compatibility(urllib3_version, chardet_version):
+    urllib3_version = urllib3_version.split('.')
+    assert urllib3_version != ['dev']  # Verify urllib3 isn't installed from git.
+
+    # Sometimes, urllib3 only reports its version as 16.1.
+    if len(urllib3_version) == 2:
+        urllib3_version.append('0')
+
+    # Check urllib3 for compatibility.
+    major, minor, patch = urllib3_version  # noqa: F811
+    major, minor, patch = int(major), int(minor), int(patch)
+    # urllib3 >= 1.21.1, <= 1.22
+    assert major == 1
+    assert minor >= 21
+    assert minor <= 22
+
+    # Check chardet for compatibility.
+    major, minor, patch = chardet_version.split('.')[:3]
+    major, minor, patch = int(major), int(minor), int(patch)
+    # chardet >= 3.0.2, < 3.1.0
+    assert major == 3
+    assert minor < 1
+    assert patch >= 2
+
+
+# Check imported dependencies for compatibility.
+try:
+    check_compatibility(urllib3.__version__, chardet.__version__)
+except (AssertionError, ValueError):
+    warnings.warn("urllib3 ({0}) or chardet ({1}) doesn't match a supported "
+                  "version!".format(urllib3.__version__, chardet.__version__),
+                  RequestsDependencyWarning)
 
 # Attempt to enable urllib3's SNI support, if possible
 # Note: Patched by pip to prevent using the PyOpenSSL module. On Windows this
 #       prevents upgrading cryptography.
 # try:
-#     from .packages.urllib3.contrib import pyopenssl
+#     from pip._vendor.urllib3.contrib import pyopenssl
 #     pyopenssl.inject_into_urllib3()
 # except ImportError:
 #     pass
 
-import warnings
-
 # urllib3's DependencyWarnings should be silenced.
-from .packages.urllib3.exceptions import DependencyWarning
+from pip._vendor.urllib3.exceptions import DependencyWarning
 warnings.simplefilter('ignore', DependencyWarning)
 
+from .__version__ import __title__, __description__, __url__, __version__
+from .__version__ import __build__, __author__, __author_email__, __license__
+from .__version__ import __copyright__, __cake__
+
 from . import utils
+from . import packages
 from .models import Request, Response, PreparedRequest
 from .api import request, get, head, post, patch, put, delete, options
 from .sessions import session, Session

src/pip/_vendor/requests/packages/chardet/cli/chardetect.py renamed to src/pip/_vendor/chardet/cli/chardetect.py

@@ -0,0 +1,14 @@
+# .-. .-. .-. . . .-. .-. .-. .-.
+# |(  |-  |.| | | |-  `-.  |  `-.
+# ' ' `-' `-`.`-' `-' `-'  '  `-'
+
+__title__ = 'requests'
+__description__ = 'Python HTTP for Humans.'
+__url__ = 'http://python-requests.org'
+__version__ = '2.18.4'
+__build__ = 0x021804
+__author__ = 'Kenneth Reitz'
+__author_email__ = '[email protected]'
+__license__ = 'Apache 2.0'
+__copyright__ = 'Copyright 2017 Kenneth Reitz'
+__cake__ = u'\u2728 \U0001f370 \u2728'