Attached is the diff against the Ubuntu version of the package. You should be able to extract the relevant changes for the Debian version, but because you might be interested in our delta from Debian, I'm including the entire diff. If not, let me know and I can prepare a diff just for the Debian version.
=== modified file 'debian/changelog'
--- debian/changelog 2012-09-13 14:55:21 +0000
+++ debian/changelog 2012-11-07 20:11:05 +0000
@@ -1,3 +1,15 @@
+requests (0.14.2-0ubuntu1) raring; urgency=low
+
+ * New upstream release (LP: #1076107). Remaining changes:
+ - debian/patches/01_do-not-use-python-certifi.patch: No longer necessary.
+ - debian/patches/02_do-not-use-embedded-python-six.patch: refreshed
+ - debian/patches/03-dont-use-embeded-urllib3.patch: refreshed and
+ renamed to 03-use-distro-packages.patch
+ - debian/control: python-chardet and python3-chardet are now required
+ (i.e. Depends instead of Recommends).
+
+ -- Barry Warsaw <ba...@ubuntu.com> Thu, 01 Nov 2012 14:56:00 +0100
+
requests (0.12.1-1ubuntu6) quantal; urgency=low
* debian/control: Resolve Depends misspelling of python-urllib3.
=== modified file 'debian/control'
--- debian/control 2012-09-13 14:55:21 +0000
+++ debian/control 2012-11-07 19:46:11 +0000
@@ -11,6 +11,7 @@
python3-all,
python3-six,
python-chardet,
+ python3-chardet,
python-urllib3,
python3-urllib3,
python-gevent,
@@ -30,9 +31,9 @@
${python:Depends},
ca-certificates,
python-urllib3,
- python-six
+ python-six,
+ python-chardet
Recommends:
- python-chardet,
python-gevent,
python-oauthlib
Description: elegant and simple HTTP library for Python, built for human beings
@@ -61,8 +62,7 @@
${python3:Depends},
ca-certificates,
python3-urllib3,
- python3-six
-Recommends:
+ python3-six,
python3-chardet
Description: elegant and simple HTTP library for Python3, built for human beings
Requests allow you to send HTTP/1.1 requests. You can add headers, form data,
=== removed file 'debian/patches/01_do-not-use-python-certifi.patch'
--- debian/patches/01_do-not-use-python-certifi.patch 2012-05-04 14:34:47 +0000
+++ debian/patches/01_do-not-use-python-certifi.patch 1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-Description: To verify SSL certificates for HTTPS requests, use the bundle
- provided by ca-certificates instead of python-certifi.
-Author: Daniele Tricoli <er...@mornie.org>
-Forwarded: not-needed
-Last-Update: 2012-05-04
-
---- a/setup.py
-+++ b/setup.py
-@@ -32,7 +32,7 @@
- # On certain supported platforms (e.g., Red Hat / Debian / FreeBSD), Requests can
- # use the system CA bundle instead; see `requests.utils` for details.
- # If your platform is supported, set `requires` to [] instead:
--requires = ['certifi>=0.0.7']
-+requires = []
-
- # chardet is used to optimally guess the encodings of pages that don't declare one.
- # At this time, chardet is not a required dependency. However, it's sufficiently
=== modified file 'debian/patches/02_do-not-use-embedded-python-six.patch'
--- debian/patches/02_do-not-use-embedded-python-six.patch 2012-04-01 12:33:42 +0000
+++ debian/patches/02_do-not-use-embedded-python-six.patch 2012-11-01 14:03:01 +0000
@@ -5,45 +5,47 @@
--- a/requests/packages/urllib3/connectionpool.py
+++ b/requests/packages/urllib3/connectionpool.py
-@@ -51,7 +51,7 @@
+@@ -52,7 +52,7 @@
)
-
+
from .packages.ssl_match_hostname import match_hostname, CertificateError
-from .packages import six
+import six
-
-
+
+
xrange = six.moves.xrange
--- a/requests/packages/urllib3/filepost.py
+++ b/requests/packages/urllib3/filepost.py
-@@ -14,8 +14,8 @@
-
+@@ -10,8 +10,8 @@
+ from uuid import uuid4
from io import BytesIO
-
+
-from .packages import six
-from .packages.six import b
+import six
+from six import b
-
+
writer = codecs.lookup('utf-8')[3]
-
+
--- a/requests/packages/urllib3/response.py
+++ b/requests/packages/urllib3/response.py
@@ -11,7 +11,7 @@
from io import BytesIO
-
- from .exceptions import HTTPError
+
+ from .exceptions import DecodeError
-from .packages.six import string_types as basestring
+from six import string_types as basestring
-
-
+
+
log = logging.getLogger(__name__)
--- a/requests/packages/urllib3/util.py
+++ b/requests/packages/urllib3/util.py
-@@ -16,7 +16,7 @@
+@@ -18,7 +18,7 @@
except ImportError: # `select` doesn't exist on AppEngine.
select = False
-
+
-from .packages import six
+import six
from .exceptions import LocationParseError
+
+
=== removed file 'debian/patches/03-dont-use-embeded-urllib3.patch'
--- debian/patches/03-dont-use-embeded-urllib3.patch 2012-09-07 09:06:26 +0000
+++ debian/patches/03-dont-use-embeded-urllib3.patch 1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-Description: Do not use embeded copy of python-urllib3
-Author: Chuck Short <zul...@ubuntu.com>
-Forwarded: non-need
-Last-Update: 2012-09-05
-diff -Naurp requests-0.12.1.orig/requests/models.py requests-0.12.1/requests/models.py
---- requests-0.12.1.orig/requests/models.py 2012-05-08 00:13:56.000000000 -0500
-+++ requests-0.12.1/requests/models.py 2012-09-07 09:01:14.229258477 -0500
-@@ -17,12 +17,12 @@ from .status_codes import codes
-
- from .auth import HTTPBasicAuth, HTTPProxyAuth
- from .cookies import cookiejar_from_dict, extract_cookies_to_jar, get_cookie_header
--from .packages.urllib3.response import HTTPResponse
--from .packages.urllib3.exceptions import MaxRetryError, LocationParseError
--from .packages.urllib3.exceptions import SSLError as _SSLError
--from .packages.urllib3.exceptions import HTTPError as _HTTPError
--from .packages.urllib3 import connectionpool, poolmanager
--from .packages.urllib3.filepost import encode_multipart_formdata
-+from urllib3.response import HTTPResponse
-+from urllib3.exceptions import MaxRetryError, LocationParseError
-+from urllib3.exceptions import SSLError as _SSLError
-+from urllib3.exceptions import HTTPError as _HTTPError
-+from urllib3 import connectionpool, poolmanager
-+from urllib3.filepost import encode_multipart_formdata
- from .defaults import SCHEMAS
- from .exceptions import (
- ConnectionError, HTTPError, RequestException, Timeout, TooManyRedirects,
-diff -Naurp requests-0.12.1.orig/requests/sessions.py requests-0.12.1/requests/sessions.py
---- requests-0.12.1.orig/requests/sessions.py 2012-05-07 23:56:28.000000000 -0500
-+++ requests-0.12.1/requests/sessions.py 2012-09-07 09:00:32.821258162 -0500
-@@ -15,7 +15,7 @@ from .defaults import defaults
- from .models import Request
- from .hooks import dispatch_hook
- from .utils import header_expand
--from .packages.urllib3.poolmanager import PoolManager
-+from urllib3.poolmanager import PoolManager
-
- def merge_kwargs(local_kwarg, default_kwarg):
- """Merges kwarg dictionaries.
-diff -Naurp requests-0.12.1.orig/setup.py requests-0.12.1/setup.py
---- requests-0.12.1.orig/setup.py 2012-09-07 08:42:40.000000000 -0500
-+++ requests-0.12.1/setup.py 2012-09-07 09:00:12.065257343 -0500
-@@ -24,17 +24,13 @@ if sys.argv[-1] == 'publish':
- packages = [
- 'requests',
- 'requests.packages',
-- 'requests.packages.urllib3',
-- 'requests.packages.urllib3.packages',
-- 'requests.packages.urllib3.packages.ssl_match_hostname',
-- 'requests.packages.urllib3.packages.mimetools_choose_boundary',
- ]
-
- # certifi is a Python package containing a CA certificate bundle for SSL verification.
- # On certain supported platforms (e.g., Red Hat / Debian / FreeBSD), Requests can
- # use the system CA bundle instead; see `requests.utils` for details.
- # If your platform is supported, set `requires` to [] instead:
--requires = []
-+requires = ['python-urllib3']
-
- # chardet is used to optimally guess the encodings of pages that don't declare one.
- # At this time, chardet is not a required dependency. However, it's sufficiently
=== added file 'debian/patches/03-use-distro-packages.patch'
--- debian/patches/03-use-distro-packages.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/03-use-distro-packages.patch 2012-11-07 19:34:03 +0000
@@ -0,0 +1,127 @@
+Description: Do not use embeded copy of python-urllib3
+Author: Chuck Short <zul...@ubuntu.com>
+Forwarded: non-need
+Last-Update: 2012-09-05
+--- a/requests/models.py
++++ b/requests/models.py
+@@ -18,12 +18,12 @@
+
+ from .auth import HTTPBasicAuth, HTTPProxyAuth
+ from .cookies import cookiejar_from_dict, extract_cookies_to_jar, get_cookie_header
+-from .packages.urllib3.exceptions import MaxRetryError, LocationParseError
+-from .packages.urllib3.exceptions import TimeoutError
+-from .packages.urllib3.exceptions import SSLError as _SSLError
+-from .packages.urllib3.exceptions import HTTPError as _HTTPError
+-from .packages.urllib3 import connectionpool, poolmanager
+-from .packages.urllib3.filepost import encode_multipart_formdata
++from urllib3.exceptions import MaxRetryError, LocationParseError
++from urllib3.exceptions import TimeoutError
++from urllib3.exceptions import SSLError as _SSLError
++from urllib3.exceptions import HTTPError as _HTTPError
++from urllib3 import connectionpool, poolmanager
++from urllib3.filepost import encode_multipart_formdata
+ from .defaults import SCHEMAS
+ from .exceptions import (
+ ConnectionError, HTTPError, RequestException, Timeout, TooManyRedirects,
+--- a/requests/sessions.py
++++ b/requests/sessions.py
+@@ -16,7 +16,7 @@
+ from .models import Request
+ from .hooks import dispatch_hook
+ from .utils import header_expand, from_key_val_list
+-from .packages.urllib3.poolmanager import PoolManager
++from urllib3.poolmanager import PoolManager
+
+
+ def merge_kwargs(local_kwarg, default_kwarg):
+--- a/setup.py
++++ b/setup.py
+@@ -20,24 +20,9 @@
+ packages = [
+ 'requests',
+ 'requests.packages',
+- 'requests.packages.urllib3',
+- 'requests.packages.urllib3.packages',
+- 'requests.packages.urllib3.packages.ssl_match_hostname'
+ ]
+
+-if is_py2:
+- packages.extend([
+- 'requests.packages.oauthlib',
+- 'requests.packages.oauthlib.oauth1',
+- 'requests.packages.oauthlib.oauth1.rfc5849',
+- 'requests.packages.oauthlib.oauth2',
+- 'requests.packages.oauthlib.oauth2.draft25',
+- 'requests.packages.chardet',
+- ])
+-else:
+- packages.append('requests.packages.chardet2')
+-
+-requires = []
++requires = ['python-urllib3']
+
+ setup(
+ name='requests',
+--- a/requests/adapters.py
++++ b/requests/adapters.py
+@@ -8,7 +8,7 @@
+ and maintain connections.
+ """
+
+-from .packages.urllib3.poolmanager import PoolManager
++from urllib3.poolmanager import PoolManager
+
+ class BaseAdapter(object):
+ """The Base Transport Adapter"""
+--- a/requests/compat.py
++++ b/requests/compat.py
+@@ -92,8 +92,20 @@
+ try:
+ import cchardet as chardet
+ except ImportError:
+- from .packages import chardet
+- from .packages.urllib3.packages.ordered_dict import OrderedDict
++ import chardet
++ # Here's the problem. Generally we want to use the system's urllib3
++ # library instead of the embedded one. setup.py imports requests.compat
++ # to get the is_py2 variable. However, if you're building the source
++ # package on a system with an older urllib3 that doesn't have the
++ # following import, setup.py will fail, and thus you cannot build the
++ # source package. In that case (and hopefully in no others, since the
++ # binary package Depends on python*-urllib3) grab the one from the
++ # embedded package.
++ try:
++ from urllib3.packages.ordered_dict import OrderedDict
++ except ImportError:
++ from .packages.urllib3.packages.ordered_dict import OrderedDict
++
+
+ builtin_str = str
+ bytes = str
+@@ -109,7 +121,7 @@
+ from http import cookiejar as cookielib
+ from http.cookies import Morsel
+ from io import StringIO
+- from .packages import chardet2 as chardet
++ import chardet
+ from collections import OrderedDict
+
+ builtin_str = str
+--- a/requests/packages/__init__.py
++++ b/requests/packages/__init__.py
+@@ -1,3 +1,3 @@
+ from __future__ import absolute_import
+
+-from . import urllib3
++import urllib3
+--- a/requests/safe_mode.py
++++ b/requests/safe_mode.py
+@@ -12,7 +12,7 @@
+ """
+
+ from .models import Response
+-from .packages.urllib3.response import HTTPResponse
++from urllib3.response import HTTPResponse
+ from .exceptions import RequestException, ConnectionError, HTTPError
+ import socket
+
=== modified file 'debian/patches/series'
--- debian/patches/series 2012-09-07 09:06:26 +0000
+++ debian/patches/series 2012-11-07 19:33:19 +0000
@@ -1,3 +1,2 @@
-01_do-not-use-python-certifi.patch
02_do-not-use-embedded-python-six.patch
-03-dont-use-embeded-urllib3.patch
+03-use-distro-packages.patch
signature.asc
Description: PGP signature
