Refreshed debian/patches/02_use-system-chardet-and-urllib3.patches

2 files changed, 19 insertions, 22 deletions

diff --git a/debian/changelog b/debian/changelog
index 3a20ec2..c6f0795 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ requests (1.2.3-1) UNRELEASED; urgency=low
 
   * New upstream release (Closes: #712915) (LP: #1187429)
     - Thanks to Scott Moser for the report
+  * debian/patches/02_use-system-chardet-and-urllib3.patches
+    - Refreshed
 
- -- Daniele Tricoli <eriol@mornie.org>  Fri, 21 Jun 2013 04:00:02 +0200
+ -- Daniele Tricoli <eriol@mornie.org>  Fri, 21 Jun 2013 05:40:50 +0200
 
 requests (1.2.0-2) unstable; urgency=low
 
diff --git a/debian/patches/02_use-system-chardet-and-urllib3.patch b/debian/patches/02_use-system-chardet-and-urllib3.patch
index 94d6a9f..0079d37 100644
--- a/debian/patches/02_use-system-chardet-and-urllib3.patch
+++ b/debian/patches/02_use-system-chardet-and-urllib3.patch
@@ -2,19 +2,17 @@ Description: Use the system python-chardet and python-urllib3 instead of the
  embedded copies.
 Author: Daniele Tricoli <eriol@mornie.org>
 Forwarded: not-needed
-Last-Update: 2013-01-19
+Last-Update: 2013-06-21
 
-Index: requests-1.2.0/requests/adapters.py
-===================================================================
---- requests-1.2.0.orig/requests/adapters.py	2013-05-11 05:21:57.000000000 +0000
-+++ requests-1.2.0/requests/adapters.py	2013-05-11 05:22:06.000000000 +0000
+--- a/requests/adapters.py
++++ b/requests/adapters.py
 @@ -11,16 +11,16 @@
  import socket
  
  from .models import Response
 -from .packages.urllib3.poolmanager import PoolManager, ProxyManager
 -from .packages.urllib3.response import HTTPResponse
-+from urllib3.poolmanager import PoolManager, proxy_from_url
++from urllib3.poolmanager import PoolManager, ProxyManager
 +from urllib3.response import HTTPResponse
  from .compat import urlparse, basestring, urldefrag, unquote
  from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers,
@@ -31,10 +29,8 @@ Index: requests-1.2.0/requests/adapters.py
  from .cookies import extract_cookies_to_jar
  from .exceptions import ConnectionError, Timeout, SSLError
  from .auth import _basic_auth_str
-Index: requests-1.2.0/requests/compat.py
-===================================================================
---- requests-1.2.0.orig/requests/compat.py	2013-05-11 05:21:57.000000000 +0000
-+++ requests-1.2.0/requests/compat.py	2013-05-11 05:22:06.000000000 +0000
+--- a/requests/compat.py
++++ b/requests/compat.py
 @@ -4,7 +4,7 @@
  pythoncompat
  """
@@ -53,24 +49,22 @@ Index: requests-1.2.0/requests/compat.py
  
      builtin_str = str
      bytes = str
-Index: requests-1.2.0/requests/models.py
-===================================================================
---- requests-1.2.0.orig/requests/models.py	2013-05-11 05:21:57.000000000 +0000
-+++ requests-1.2.0/requests/models.py	2013-05-11 05:22:06.000000000 +0000
-@@ -17,7 +17,7 @@
+--- a/requests/models.py
++++ b/requests/models.py
+@@ -17,8 +17,8 @@
  
  from .auth import HTTPBasicAuth
  from .cookies import cookiejar_from_dict, get_cookie_header
 -from .packages.urllib3.filepost import encode_multipart_formdata
+-from .packages.urllib3.util import parse_url
 +from urllib3.filepost import encode_multipart_formdata
++from urllib3.util import parse_url
  from .exceptions import HTTPError, RequestException, MissingSchema, InvalidURL
  from .utils import (
-     stream_untransfer, guess_filename, get_auth_from_url, requote_uri,
-Index: requests-1.2.0/setup.py
-===================================================================
---- requests-1.2.0.orig/setup.py	2013-05-11 05:22:06.000000000 +0000
-+++ requests-1.2.0/setup.py	2013-05-11 05:22:06.000000000 +0000
-@@ -16,11 +16,6 @@
+     guess_filename, get_auth_from_url, requote_uri,
+--- a/setup.py
++++ b/setup.py
+@@ -16,12 +16,6 @@
  
  packages = [
      'requests',
@@ -78,6 +72,7 @@ Index: requests-1.2.0/setup.py
 -    'requests.packages.charade',
 -    'requests.packages.urllib3',
 -    'requests.packages.urllib3.packages',
+-    'requests.packages.urllib3.contrib',
 -    'requests.packages.urllib3.packages.ssl_match_hostname'
  ]