system-charade-and-urllib3.patch

   1 diff -urN requests-2.3.0.org/requests/adapters.py requests-2.3.0/requests/adapters.py
   2 --- requests-2.3.0.org/requests/adapters.py     2014-05-16 19:44:21.000000000 +0200
   3 +++ requests-2.3.0/requests/adapters.py 2014-06-16 22:42:34.347879580 +0200
   4 @@ -11,18 +11,18 @@
   5  import socket
   6
   7  from .models import Response
   8 -from .packages.urllib3.poolmanager import PoolManager, proxy_from_url
   9 -from .packages.urllib3.response import HTTPResponse
  10 -from .packages.urllib3.util import Timeout as TimeoutSauce
  11 +from urllib3.poolmanager import PoolManager, proxy_from_url
  12 +from urllib3.response import HTTPResponse
  13 +from urllib3.util import Timeout as TimeoutSauce
  14  from .compat import urlparse, basestring, urldefrag, unquote
  15  from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers,
  16                      prepend_scheme_if_needed, get_auth_from_url)
  17  from .structures import CaseInsensitiveDict
  18 -from .packages.urllib3.exceptions import MaxRetryError
  19 -from .packages.urllib3.exceptions import TimeoutError
  20 -from .packages.urllib3.exceptions import SSLError as _SSLError
  21 -from .packages.urllib3.exceptions import HTTPError as _HTTPError
  22 -from .packages.urllib3.exceptions import ProxyError as _ProxyError
  23 +from urllib3.exceptions import MaxRetryError
  24 +from urllib3.exceptions import TimeoutError
  25 +from urllib3.exceptions import SSLError as _SSLError
  26 +from urllib3.exceptions import HTTPError as _HTTPError
  27 +from urllib3.exceptions import ProxyError as _ProxyError
  28  from .cookies import extract_cookies_to_jar
  29  from .exceptions import ConnectionError, Timeout, SSLError, ProxyError
  30  from .auth import _basic_auth_str
  31 diff -urN requests-2.3.0.org/requests/compat.py requests-2.3.0/requests/compat.py
  32 --- requests-2.3.0.org/requests/compat.py       2014-01-24 21:37:17.000000000 +0100
  33 +++ requests-2.3.0/requests/compat.py   2014-06-16 22:45:55.708024685 +0200
  34 @@ -4,7 +4,7 @@
  35  pythoncompat
  36  """
  37
  38 -from .packages import chardet
  39 +import charade as chardet
  40
  41  import sys
  42
  43 @@ -89,7 +89,7 @@
  44      import cookielib
  45      from Cookie import Morsel
  46      from StringIO import StringIO
  47 -    from .packages.urllib3.packages.ordered_dict import OrderedDict
  48 +    from urllib3.packages.ordered_dict import OrderedDict
  49      from httplib import IncompleteRead
  50
  51      builtin_str = str
  52 diff -urN requests-2.3.0.org/requests/exceptions.py requests-2.3.0/requests/exceptions.py
  53 --- requests-2.3.0.org/requests/exceptions.py   2014-03-24 16:39:20.000000000 +0100
  54 +++ requests-2.3.0/requests/exceptions.py       2014-06-16 22:42:34.347879580 +0200
  55 @@ -7,7 +7,7 @@
  56  This module contains the set of Requests' exceptions.
  57
  58  """
  59 -from .packages.urllib3.exceptions import HTTPError as BaseHTTPError
  60 +from urllib3.exceptions import HTTPError as BaseHTTPError
  61
  62
  63  class RequestException(IOError):
  64 diff -urN requests-2.3.0.org/requests/__init__.py requests-2.3.0/requests/__init__.py
  65 --- requests-2.3.0.org/requests/__init__.py     2014-05-16 19:55:34.000000000 +0200
  66 +++ requests-2.3.0/requests/__init__.py 2014-06-16 22:42:34.351213026 +0200
  67 @@ -50,7 +50,7 @@
  68
  69  # Attempt to enable urllib3's SNI support, if possible
  70  try:
  71 -    from .packages.urllib3.contrib import pyopenssl
  72 +    from urllib3.contrib import pyopenssl
  73      pyopenssl.inject_into_urllib3()
  74  except ImportError:
  75      pass
  76 diff -urN requests-2.3.0.org/requests/models.py requests-2.3.0/requests/models.py
  77 --- requests-2.3.0.org/requests/models.py       2014-05-12 21:08:50.000000000 +0200
  78 +++ requests-2.3.0/requests/models.py   2014-06-16 22:42:34.351213026 +0200
  79 @@ -16,10 +16,10 @@
  80
  81  from .auth import HTTPBasicAuth
  82  from .cookies import cookiejar_from_dict, get_cookie_header
  83 -from .packages.urllib3.fields import RequestField
  84 -from .packages.urllib3.filepost import encode_multipart_formdata
  85 -from .packages.urllib3.util import parse_url
  86 -from .packages.urllib3.exceptions import DecodeError
  87 +from urllib3.fields import RequestField
  88 +from urllib3.filepost import encode_multipart_formdata
  89 +from urllib3.util import parse_url
  90 +from urllib3.exceptions import DecodeError
  91  from .exceptions import (
  92      HTTPError, RequestException, MissingSchema, InvalidURL,
  93      ChunkedEncodingError, ContentDecodingError)
  94 diff -urN requests-2.3.0.org/setup.py requests-2.3.0/setup.py
  95 --- requests-2.3.0.org/setup.py 2014-05-12 21:08:50.000000000 +0200
  96 +++ requests-2.3.0/setup.py     2014-06-16 22:43:05.005583540 +0200
  97 @@ -15,14 +15,7 @@
  98      sys.exit()
  99
 100  packages = [
 101 -    'requests',
 102 -    'requests.packages',
 103 -    'requests.packages.chardet',
 104 -    'requests.packages.urllib3',
 105 -    'requests.packages.urllib3.packages',
 106 -    'requests.packages.urllib3.contrib',
 107 -    'requests.packages.urllib3.util',
 108 -    'requests.packages.urllib3.packages.ssl_match_hostname',
 109 +    'requests'
 110  ]
 111
 112  requires = []