Refresh 02_use-system-chardet-and-urllib3.patch

2 files changed, 18 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index b629685..1020233 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ requests (2.7.0-1) UNRELEASED; urgency=medium
       (Closes: #770172)
   * debian/watch
     - Use pypi.debian.net redirector.
+  * debian/patches/02_use-system-chardet-and-urllib3.patch
+    - Refresh.
 
- -- Daniele Tricoli <eriol@mornie.org>  Sun, 03 May 2015 18:10:48 +0200
+ -- Daniele Tricoli <eriol@mornie.org>  Sun, 03 May 2015 19:37:00 +0200
 
 requests (2.4.3-6) unstable; urgency=medium
 
diff --git a/debian/patches/02_use-system-chardet-and-urllib3.patch b/debian/patches/02_use-system-chardet-and-urllib3.patch
index 8836c47..95a2376 100644
--- a/debian/patches/02_use-system-chardet-and-urllib3.patch
+++ b/debian/patches/02_use-system-chardet-and-urllib3.patch
@@ -1,24 +1,23 @@
 Description: Use the system python-chardet and python-urllib3 instead of the
- embedded copies but provide requests.packages package because it will be
- used to supply a stub for ``requests.packages.urllib3``.
+ embedded copies.
 Author: Daniele Tricoli <eriol@mornie.org>
 Forwarded: not-needed
-Last-Update: 2014-10-21
+Last-Update: 2015-05-03
 
 --- a/requests/adapters.py
 +++ b/requests/adapters.py
-@@ -11,21 +11,21 @@
+@@ -11,22 +11,22 @@
  import socket
  
  from .models import Response
--from .packages.urllib3 import Retry
 -from .packages.urllib3.poolmanager import PoolManager, proxy_from_url
 -from .packages.urllib3.response import HTTPResponse
 -from .packages.urllib3.util import Timeout as TimeoutSauce
-+from urllib3 import Retry
+-from .packages.urllib3.util.retry import Retry
 +from urllib3.poolmanager import PoolManager, proxy_from_url
 +from urllib3.response import HTTPResponse
 +from urllib3.util import Timeout as TimeoutSauce
++from urllib3.util.retry import Retry
  from .compat import urlparse, basestring
  from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers,
                      prepend_scheme_if_needed, get_auth_from_url, urldefragauth)
@@ -30,6 +29,7 @@ Last-Update: 2014-10-21
 -from .packages.urllib3.exceptions import ProtocolError
 -from .packages.urllib3.exceptions import ReadTimeoutError
 -from .packages.urllib3.exceptions import SSLError as _SSLError
+-from .packages.urllib3.exceptions import ResponseError
 +from urllib3.exceptions import ConnectTimeoutError
 +from urllib3.exceptions import HTTPError as _HTTPError
 +from urllib3.exceptions import MaxRetryError
@@ -37,9 +37,10 @@ Last-Update: 2014-10-21
 +from urllib3.exceptions import ProtocolError
 +from urllib3.exceptions import ReadTimeoutError
 +from urllib3.exceptions import SSLError as _SSLError
++from urllib3.exceptions import ResponseError
  from .cookies import extract_cookies_to_jar
  from .exceptions import (ConnectionError, ConnectTimeout, ReadTimeout, SSLError,
-                          ProxyError)
+                          ProxyError, RetryError)
 --- a/requests/compat.py
 +++ b/requests/compat.py
 @@ -4,7 +4,7 @@
@@ -51,7 +52,7 @@ Last-Update: 2014-10-21
  
  import sys
  
-@@ -91,7 +91,7 @@
+@@ -39,7 +39,7 @@
      import cookielib
      from Cookie import Morsel
      from StringIO import StringIO
@@ -65,7 +66,7 @@ Last-Update: 2014-10-21
 @@ -16,10 +16,10 @@
  
  from .auth import HTTPBasicAuth
- from .cookies import cookiejar_from_dict, get_cookie_header
+ from .cookies import cookiejar_from_dict, get_cookie_header, _copy_cookie_jar
 -from .packages.urllib3.fields import RequestField
 -from .packages.urllib3.filepost import encode_multipart_formdata
 -from .packages.urllib3.util import parse_url
@@ -74,15 +75,16 @@ Last-Update: 2014-10-21
 +from urllib3.filepost import encode_multipart_formdata
 +from urllib3.util import parse_url
 +from urllib3.exceptions import (
-     DecodeError, ReadTimeoutError, ProtocolError)
+     DecodeError, ReadTimeoutError, ProtocolError, LocationParseError)
  from .exceptions import (
-     HTTPError, RequestException, MissingSchema, InvalidURL, 
+     HTTPError, MissingSchema, InvalidURL, ChunkedEncodingError,
 --- a/setup.py
 +++ b/setup.py
-@@ -19,12 +19,6 @@
+@@ -17,13 +17,6 @@
+ 
  packages = [
      'requests',
-     'requests.packages',
+-    'requests.packages',
 -    'requests.packages.chardet',
 -    'requests.packages.urllib3',
 -    'requests.packages.urllib3.packages',