From a8dc203b4c380210a53c27e92c663851038f6020 Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Thu, 3 Jul 2014 17:11:17 +0000 Subject: Provide requests.packages package because it will be used to supply a stub for requests.packages.urllib3 --- debian/changelog | 8 ++++++++ debian/patches/02_use-system-chardet-and-urllib3.patch | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9cad6ee..1476497 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +requests (2.3.0-2) UNRELEASED; urgency=medium + + * debian/patches/02_use-system-chardet-and-urllib3.patch + - Provide requests.packages package because it will be used to supply + a stub for requests.packages.urllib3 + + -- Daniele Tricoli Thu, 03 Jul 2014 19:09:56 +0200 + requests (2.3.0-1) unstable; urgency=medium * Team upload. diff --git a/debian/patches/02_use-system-chardet-and-urllib3.patch b/debian/patches/02_use-system-chardet-and-urllib3.patch index 54df371..6853e01 100644 --- a/debian/patches/02_use-system-chardet-and-urllib3.patch +++ b/debian/patches/02_use-system-chardet-and-urllib3.patch @@ -1,8 +1,9 @@ Description: Use the system python-chardet and python-urllib3 instead of the - embedded copies. + embedded copies but provide requests.packages package because it will be + used to supply a stub for ``requests.packages.urllib3``. Author: Daniele Tricoli Forwarded: not-needed -Last-Update: 2014-01-27 +Last-Update: 2014-07-03 --- a/requests/adapters.py +++ b/requests/adapters.py @@ -72,11 +73,10 @@ Last-Update: 2014-01-27 ChunkedEncodingError, ContentDecodingError) --- a/setup.py +++ b/setup.py -@@ -16,13 +16,6 @@ - +@@ -17,12 +17,6 @@ packages = [ 'requests', -- 'requests.packages', + 'requests.packages', - 'requests.packages.chardet', - 'requests.packages.urllib3', - 'requests.packages.urllib3.packages', -- cgit v1.2.3 From 93f697775b605d4221eea87a8ab02bdf55eea4f3 Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Thu, 3 Jul 2014 17:27:30 +0000 Subject: Provide requests.packages.urllib3 as symlink of python{,3}-urllib3 system package since it is used as import location. (Closes: #753578) --- debian/changelog | 5 ++++- debian/python-requests.links | 2 ++ debian/python3-requests.links | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 debian/python-requests.links create mode 100644 debian/python3-requests.links (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1476497..e756a3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,11 @@ requests (2.3.0-2) UNRELEASED; urgency=medium * debian/patches/02_use-system-chardet-and-urllib3.patch - Provide requests.packages package because it will be used to supply a stub for requests.packages.urllib3 + * debian/python{,3}-requests.links: + - Provide requests.packages.urllib3 as symlink of python{,3}-urllib3 + system package since it is used as import location. (Closes: #753578) - -- Daniele Tricoli Thu, 03 Jul 2014 19:09:56 +0200 + -- Daniele Tricoli Thu, 03 Jul 2014 19:13:01 +0200 requests (2.3.0-1) unstable; urgency=medium diff --git a/debian/python-requests.links b/debian/python-requests.links new file mode 100644 index 0000000..aa25f83 --- /dev/null +++ b/debian/python-requests.links @@ -0,0 +1,2 @@ +# requests.packages.urllib3 is used as import location for urllib3 +usr/lib/python2.7/dist-packages/urllib3 usr/lib/python2.7/dist-packages/requests/packages/urllib3 diff --git a/debian/python3-requests.links b/debian/python3-requests.links new file mode 100644 index 0000000..7bbc4e3 --- /dev/null +++ b/debian/python3-requests.links @@ -0,0 +1,2 @@ +# requests.packages.urllib3 is used as import location for urllib3 +usr/lib/python3/dist-packages/urllib3 usr/lib/python3/dist-packages/requests/packages/urllib3 -- cgit v1.2.3 From e81af4ad239268f244c0aecde47fba79feda4964 Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Wed, 8 Oct 2014 17:05:23 +0000 Subject: New upstream release --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e756a3e..6dc3545 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -requests (2.3.0-2) UNRELEASED; urgency=medium +requests (2.4.2-1) UNRELEASED; urgency=medium + * New upstream release * debian/patches/02_use-system-chardet-and-urllib3.patch - Provide requests.packages package because it will be used to supply a stub for requests.packages.urllib3 @@ -7,7 +8,7 @@ requests (2.3.0-2) UNRELEASED; urgency=medium - Provide requests.packages.urllib3 as symlink of python{,3}-urllib3 system package since it is used as import location. (Closes: #753578) - -- Daniele Tricoli Thu, 03 Jul 2014 19:13:01 +0200 + -- Daniele Tricoli Wed, 08 Oct 2014 19:04:10 +0200 requests (2.3.0-1) unstable; urgency=medium -- cgit v1.2.3 From 00706dce34a64a1ff3e6f4dcdaba94ab43062b89 Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Wed, 8 Oct 2014 17:50:19 +0000 Subject: Refresh 01_use-system-ca-certificates.patch --- debian/changelog | 6 ++++-- debian/patches/01_use-system-ca-certificates.patch | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6dc3545..4a0ef6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ requests (2.4.2-1) UNRELEASED; urgency=medium - * New upstream release + * New upstream release. + * debian/patches/01_use-system-ca-certificates.patch + - Refresh. * debian/patches/02_use-system-chardet-and-urllib3.patch - Provide requests.packages package because it will be used to supply a stub for requests.packages.urllib3 @@ -8,7 +10,7 @@ requests (2.4.2-1) UNRELEASED; urgency=medium - Provide requests.packages.urllib3 as symlink of python{,3}-urllib3 system package since it is used as import location. (Closes: #753578) - -- Daniele Tricoli Wed, 08 Oct 2014 19:04:10 +0200 + -- Daniele Tricoli Wed, 08 Oct 2014 19:46:37 +0200 requests (2.3.0-1) unstable; urgency=medium diff --git a/debian/patches/01_use-system-ca-certificates.patch b/debian/patches/01_use-system-ca-certificates.patch index 6f18dcb..258455e 100644 --- a/debian/patches/01_use-system-ca-certificates.patch +++ b/debian/patches/01_use-system-ca-certificates.patch @@ -2,22 +2,24 @@ Description: Use the bundle provided by ca-certificates instead of the embedded one. Author: Daniele Tricoli Forwarded: not-needed -Last-Update: 2013-01-19 +Last-Update: 2014-10-08 --- a/requests/certs.py +++ b/requests/certs.py -@@ -18,7 +18,7 @@ - def where(): - """Return the preferred certificate bundle.""" - # vendored bundle inside Requests -- return os.path.join(os.path.dirname(__file__), 'cacert.pem') -+ return '/etc/ssl/certs/ca-certificates.crt' +@@ -18,8 +18,8 @@ + except ImportError: + def where(): + """Return the preferred certificate bundle.""" +- # vendored bundle inside Requests +- return os.path.join(os.path.dirname(__file__), 'cacert.pem') ++ # On Debian systems use ca-certificates ++ return '/etc/ssl/certs/ca-certificates.crt' if __name__ == '__main__': print(where()) --- a/setup.py +++ b/setup.py -@@ -41,7 +41,7 @@ +@@ -43,7 +43,7 @@ author_email='me@kennethreitz.com', url='http://python-requests.org', packages=packages, -- cgit v1.2.3 From 3d2a979750bfa478bda9a37ae54d2b07a75eee00 Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Wed, 8 Oct 2014 18:22:12 +0000 Subject: Refresh 02_use-system-chardet-and-urllib3.patch --- debian/changelog | 5 +-- .../02_use-system-chardet-and-urllib3.patch | 42 ++++++++++++---------- 2 files changed, 27 insertions(+), 20 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4a0ef6f..0cd0c93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,13 +4,14 @@ requests (2.4.2-1) UNRELEASED; urgency=medium * debian/patches/01_use-system-ca-certificates.patch - Refresh. * debian/patches/02_use-system-chardet-and-urllib3.patch + - Refresh. - Provide requests.packages package because it will be used to supply - a stub for requests.packages.urllib3 + a stub for requests.packages.urllib3. * debian/python{,3}-requests.links: - Provide requests.packages.urllib3 as symlink of python{,3}-urllib3 system package since it is used as import location. (Closes: #753578) - -- Daniele Tricoli Wed, 08 Oct 2014 19:46:37 +0200 + -- Daniele Tricoli Wed, 08 Oct 2014 20:20:41 +0200 requests (2.3.0-1) 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 6853e01..d37859a 100644 --- a/debian/patches/02_use-system-chardet-and-urllib3.patch +++ b/debian/patches/02_use-system-chardet-and-urllib3.patch @@ -3,37 +3,43 @@ Description: Use the system python-chardet and python-urllib3 instead of the used to supply a stub for ``requests.packages.urllib3``. Author: Daniele Tricoli Forwarded: not-needed -Last-Update: 2014-07-03 +Last-Update: 2014-10-08 --- a/requests/adapters.py +++ b/requests/adapters.py -@@ -11,18 +11,18 @@ +@@ -11,21 +11,21 @@ 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 urllib3.poolmanager import PoolManager, proxy_from_url +from urllib3.response import HTTPResponse +from urllib3.util import Timeout as TimeoutSauce - from .compat import urlparse, basestring, urldefrag, unquote + from .compat import urlparse, basestring, urldefrag from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers, prepend_scheme_if_needed, get_auth_from_url) from .structures import CaseInsensitiveDict --from .packages.urllib3.exceptions import MaxRetryError --from .packages.urllib3.exceptions import TimeoutError --from .packages.urllib3.exceptions import SSLError as _SSLError +-from .packages.urllib3.exceptions import ConnectTimeoutError -from .packages.urllib3.exceptions import HTTPError as _HTTPError +-from .packages.urllib3.exceptions import MaxRetryError -from .packages.urllib3.exceptions import ProxyError as _ProxyError -+from urllib3.exceptions import MaxRetryError -+from urllib3.exceptions import TimeoutError -+from urllib3.exceptions import SSLError as _SSLError +-from .packages.urllib3.exceptions import ProtocolError +-from .packages.urllib3.exceptions import ReadTimeoutError +-from .packages.urllib3.exceptions import SSLError as _SSLError ++from urllib3.exceptions import ConnectTimeoutError +from urllib3.exceptions import HTTPError as _HTTPError ++from urllib3.exceptions import MaxRetryError +from urllib3.exceptions import ProxyError as _ProxyError ++from urllib3.exceptions import ProtocolError ++from urllib3.exceptions import ReadTimeoutError ++from urllib3.exceptions import SSLError as _SSLError from .cookies import extract_cookies_to_jar - from .exceptions import ConnectionError, Timeout, SSLError, ProxyError - from .auth import _basic_auth_str + from .exceptions import (ConnectionError, ConnectTimeout, ReadTimeout, SSLError, + ProxyError) --- a/requests/compat.py +++ b/requests/compat.py @@ -4,7 +4,7 @@ @@ -45,15 +51,15 @@ Last-Update: 2014-07-03 import sys -@@ -89,7 +89,7 @@ +@@ -91,7 +91,7 @@ import cookielib from Cookie import Morsel from StringIO import StringIO - from .packages.urllib3.packages.ordered_dict import OrderedDict + from urllib3.packages.ordered_dict import OrderedDict - from httplib import IncompleteRead builtin_str = str + bytes = str --- a/requests/models.py +++ b/requests/models.py @@ -16,10 +16,10 @@ @@ -63,17 +69,17 @@ Last-Update: 2014-07-03 -from .packages.urllib3.fields import RequestField -from .packages.urllib3.filepost import encode_multipart_formdata -from .packages.urllib3.util import parse_url --from .packages.urllib3.exceptions import DecodeError +-from .packages.urllib3.exceptions import ( +from urllib3.fields import RequestField +from urllib3.filepost import encode_multipart_formdata +from urllib3.util import parse_url -+from urllib3.exceptions import DecodeError ++from urllib3.exceptions import ( + DecodeError, ReadTimeoutError, ProtocolError) from .exceptions import ( - HTTPError, RequestException, MissingSchema, InvalidURL, - ChunkedEncodingError, ContentDecodingError) + HTTPError, RequestException, MissingSchema, InvalidURL, --- a/setup.py +++ b/setup.py -@@ -17,12 +17,6 @@ +@@ -19,12 +19,6 @@ packages = [ 'requests', 'requests.packages', -- cgit v1.2.3 From a4dc6d8fd25c2b89ad6bc1d03be7305ffd34056b Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Wed, 8 Oct 2014 18:38:44 +0000 Subject: Fix duplicate-short-description --- debian/changelog | 4 +++- debian/control | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0cd0c93..d07bb55 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ requests (2.4.2-1) UNRELEASED; urgency=medium * New upstream release. + * debian/control + - Fix duplicate-short-description. * debian/patches/01_use-system-ca-certificates.patch - Refresh. * debian/patches/02_use-system-chardet-and-urllib3.patch @@ -11,7 +13,7 @@ requests (2.4.2-1) UNRELEASED; urgency=medium - Provide requests.packages.urllib3 as symlink of python{,3}-urllib3 system package since it is used as import location. (Closes: #753578) - -- Daniele Tricoli Wed, 08 Oct 2014 20:20:41 +0200 + -- Daniele Tricoli Wed, 08 Oct 2014 20:23:42 +0200 requests (2.3.0-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 80eef11..f0c9586 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,7 @@ Depends: ca-certificates, python-urllib3 (>= 1.7.1), ${misc:Depends}, ${python:Depends} -Description: elegant and simple HTTP library for Python, built for human beings +Description: elegant and simple HTTP library for Python2, built for human beings Requests allow you to send HTTP/1.1 requests. You can add headers, form data, multipart files, and parameters with simple Python dictionaries, and access the response data in the same way. It's powered by httplib and urllib3, but @@ -56,7 +56,7 @@ Depends: ca-certificates, python3-urllib3 (>= 1.5), ${misc:Depends}, ${python3:Depends} -Description: elegant and simple HTTP library for Python, built for human beings +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, multipart files, and parameters with simple Python dictionaries, and access the response data in the same way. It's powered by httplib and urllib3, but -- cgit v1.2.3 From 6cc3b1339e94169b17bc977f632992041ae60425 Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Wed, 8 Oct 2014 18:49:34 +0000 Subject: Bump Standards-Version to 3.9.6 (no changes needed) --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d07bb55..72f2cb3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ requests (2.4.2-1) UNRELEASED; urgency=medium * New upstream release. * debian/control - Fix duplicate-short-description. + - Bump Standards-Version to 3.9.6 (no changes needed). * debian/patches/01_use-system-ca-certificates.patch - Refresh. * debian/patches/02_use-system-chardet-and-urllib3.patch @@ -13,7 +14,7 @@ requests (2.4.2-1) UNRELEASED; urgency=medium - Provide requests.packages.urllib3 as symlink of python{,3}-urllib3 system package since it is used as import location. (Closes: #753578) - -- Daniele Tricoli Wed, 08 Oct 2014 20:23:42 +0200 + -- Daniele Tricoli Wed, 08 Oct 2014 20:49:10 +0200 requests (2.3.0-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index f0c9586..91929df 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 9), python3-setuptools, python3-urllib3 (>= 1.7.1), python3-wheel -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 X-Python-Version: >= 2.7 X-Python3-Version: >= 3.0 Homepage: http://python-requests.org -- cgit v1.2.3 From e87613731cb41cf37e5fea81a055478cce77b6d4 Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Wed, 8 Oct 2014 18:58:07 +0000 Subject: As the DevRef suggests, add retroactively the CVE reference for CVE-2014-1829 and CVE-2014-1830 fixed with 2.3.0-1 upload (see #733108) --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 72f2cb3..82f992e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,11 +14,12 @@ requests (2.4.2-1) UNRELEASED; urgency=medium - Provide requests.packages.urllib3 as symlink of python{,3}-urllib3 system package since it is used as import location. (Closes: #753578) - -- Daniele Tricoli Wed, 08 Oct 2014 20:49:10 +0200 + -- Daniele Tricoli Wed, 08 Oct 2014 20:53:08 +0200 requests (2.3.0-1) unstable; urgency=medium * Team upload. + - Fix CVE-2014-1829 and CVE-2014-1830 (Closes: #733108) * New upstream release. * d/control: Added python{,3}-pytest to Build-Depends. * d/patches/*: Refreshed. -- cgit v1.2.3 From 93fe8e374d773f4bd6bc6239920b1dc79c543ec9 Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Wed, 8 Oct 2014 19:23:37 +0000 Subject: - Add python-ndg-httpsclient, python-openssl and python-pyasn1 into python-urllib3's Recomends to ensure that SNI works as expected and to prevent CRIME attack. (Closes: #755805) - Add python3-ndg-httpsclient, python3-openssl and python3-pyasn1 into python3-urllib3's Suggests since Python 3 already support SNI and and SSL compression can be disabled using OP_NO_COMPRESSION. --- debian/changelog | 8 ++++++- debian/control | 66 +++++++++++++++++++++++++++++++++----------------------- 2 files changed, 46 insertions(+), 28 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 82f992e..806b156 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,12 @@ requests (2.4.2-1) UNRELEASED; urgency=medium * debian/control - Fix duplicate-short-description. - Bump Standards-Version to 3.9.6 (no changes needed). + - Add python-ndg-httpsclient, python-openssl and python-pyasn1 into + python-urllib3's Recomends to ensure that SNI works as expected and to + prevent CRIME attack. (Closes: #755805) + - Add python3-ndg-httpsclient, python3-openssl and python3-pyasn1 into + python3-urllib3's Suggests since Python 3 already support SNI and + and SSL compression can be disabled using OP_NO_COMPRESSION. * debian/patches/01_use-system-ca-certificates.patch - Refresh. * debian/patches/02_use-system-chardet-and-urllib3.patch @@ -14,7 +20,7 @@ requests (2.4.2-1) UNRELEASED; urgency=medium - Provide requests.packages.urllib3 as symlink of python{,3}-urllib3 system package since it is used as import location. (Closes: #753578) - -- Daniele Tricoli Wed, 08 Oct 2014 20:53:08 +0200 + -- Daniele Tricoli Wed, 08 Oct 2014 21:17:18 +0200 requests (2.3.0-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 91929df..a30593a 100644 --- a/debian/control +++ b/debian/control @@ -3,19 +3,20 @@ Maintainer: Debian Python Modules Team Section: python Priority: optional -Build-Depends: debhelper (>= 9), - dh-python, - python-all (>= 2.6.6-3), - python-chardet, - python-pytest, - python-setuptools, - python-urllib3 (>= 1.7.1), - python3-all, - python3-chardet, - python3-pytest, - python3-setuptools, - python3-urllib3 (>= 1.7.1), - python3-wheel +Build-Depends: + debhelper (>= 9), + dh-python, + python-all (>= 2.6.6-3), + python-chardet, + python-pytest, + python-setuptools, + python-urllib3 (>= 1.7.1), + python3-all, + python3-chardet, + python3-pytest, + python3-setuptools, + python3-urllib3 (>= 1.7.1), + python3-wheel Standards-Version: 3.9.6 X-Python-Version: >= 2.7 X-Python3-Version: >= 3.0 @@ -25,11 +26,16 @@ Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/requests/t Package: python-requests Architecture: all -Depends: ca-certificates, - python-chardet, - python-urllib3 (>= 1.7.1), - ${misc:Depends}, - ${python:Depends} +Depends: + ${misc:Depends}, + ${python:Depends}, + ca-certificates, + python-chardet, + python-urllib3 (>= 1.7.1) +Recommends: + python-ndg-httpsclient, + python-openssl, + python-pyasn1 Description: elegant and simple HTTP library for Python2, built for human beings Requests allow you to send HTTP/1.1 requests. You can add headers, form data, multipart files, and parameters with simple Python dictionaries, and access @@ -51,11 +57,16 @@ Description: elegant and simple HTTP library for Python2, built for human beings Package: python3-requests Architecture: all -Depends: ca-certificates, - python3-chardet, - python3-urllib3 (>= 1.5), - ${misc:Depends}, - ${python3:Depends} +Depends: + ${misc:Depends}, + ${python3:Depends}, + ca-certificates, + python3-chardet, + python3-urllib3 (>= 1.5) +Suggests: + python3-ndg-httpsclient, + python3-openssl, + python3-pyasn1 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, multipart files, and parameters with simple Python dictionaries, and access @@ -79,10 +90,11 @@ Description: elegant and simple HTTP library for Python3, built for human beings Package: python-requests-whl Architecture: all -Depends: ca-certificates, - python-urllib3-whl, - ${misc:Depends}, - ${python3:Depends} +Depends: + ${misc:Depends}, + ${python3:Depends}, + ca-certificates, + python-urllib3-whl Description: elegant and simple HTTP library for Python, built for human beings Requests allow you to send HTTP/1.1 requests. You can add headers, form data, multipart files, and parameters with simple Python dictionaries, and access -- cgit v1.2.3 From 495e40217076806f4962aca5aeef815963a64bb1 Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Mon, 20 Oct 2014 22:10:11 +0000 Subject: New upstream release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 806b156..46f74cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -requests (2.4.2-1) UNRELEASED; urgency=medium +requests (2.4.3-1) UNRELEASED; urgency=medium * New upstream release. * debian/control @@ -20,7 +20,7 @@ requests (2.4.2-1) UNRELEASED; urgency=medium - Provide requests.packages.urllib3 as symlink of python{,3}-urllib3 system package since it is used as import location. (Closes: #753578) - -- Daniele Tricoli Wed, 08 Oct 2014 21:17:18 +0200 + -- Daniele Tricoli Tue, 21 Oct 2014 00:09:34 +0200 requests (2.3.0-1) unstable; urgency=medium -- cgit v1.2.3 From e34a0f280764876afedaeabd18e99ea4d9a77292 Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Mon, 20 Oct 2014 23:31:49 +0000 Subject: Refresh 02_use-system-chardet-and-urllib3.patch --- debian/patches/02_use-system-chardet-and-urllib3.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/patches/02_use-system-chardet-and-urllib3.patch b/debian/patches/02_use-system-chardet-and-urllib3.patch index d37859a..8836c47 100644 --- a/debian/patches/02_use-system-chardet-and-urllib3.patch +++ b/debian/patches/02_use-system-chardet-and-urllib3.patch @@ -3,7 +3,7 @@ Description: Use the system python-chardet and python-urllib3 instead of the used to supply a stub for ``requests.packages.urllib3``. Author: Daniele Tricoli Forwarded: not-needed -Last-Update: 2014-10-08 +Last-Update: 2014-10-21 --- a/requests/adapters.py +++ b/requests/adapters.py @@ -19,9 +19,9 @@ Last-Update: 2014-10-08 +from urllib3.poolmanager import PoolManager, proxy_from_url +from urllib3.response import HTTPResponse +from urllib3.util import Timeout as TimeoutSauce - from .compat import urlparse, basestring, urldefrag + from .compat import urlparse, basestring from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers, - prepend_scheme_if_needed, get_auth_from_url) + prepend_scheme_if_needed, get_auth_from_url, urldefragauth) from .structures import CaseInsensitiveDict -from .packages.urllib3.exceptions import ConnectTimeoutError -from .packages.urllib3.exceptions import HTTPError as _HTTPError -- cgit v1.2.3 From 6de4bcf493ab9b89cfd343b6f40fff031319f443 Mon Sep 17 00:00:00 2001 From: Daniele Tricoli Date: Mon, 20 Oct 2014 23:39:16 +0000 Subject: Bump python{,3}-urllib3 to (>=1.9.1) --- debian/changelog | 3 ++- debian/control | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 46f74cc..3d98479 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ requests (2.4.3-1) UNRELEASED; urgency=medium - Add python3-ndg-httpsclient, python3-openssl and python3-pyasn1 into python3-urllib3's Suggests since Python 3 already support SNI and and SSL compression can be disabled using OP_NO_COMPRESSION. + - Bump python{,3}-urllib3 to (>=1.9.1). * debian/patches/01_use-system-ca-certificates.patch - Refresh. * debian/patches/02_use-system-chardet-and-urllib3.patch @@ -20,7 +21,7 @@ requests (2.4.3-1) UNRELEASED; urgency=medium - Provide requests.packages.urllib3 as symlink of python{,3}-urllib3 system package since it is used as import location. (Closes: #753578) - -- Daniele Tricoli Tue, 21 Oct 2014 00:09:34 +0200 + -- Daniele Tricoli Tue, 21 Oct 2014 01:35:59 +0200 requests (2.3.0-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index a30593a..bed863d 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: python-chardet, python-pytest, python-setuptools, - python-urllib3 (>= 1.7.1), + python-urllib3 (>= 1.9.1), python3-all, python3-chardet, python3-pytest, @@ -31,7 +31,7 @@ Depends: ${python:Depends}, ca-certificates, python-chardet, - python-urllib3 (>= 1.7.1) + python-urllib3 (>= 1.9.1) Recommends: python-ndg-httpsclient, python-openssl, @@ -62,7 +62,7 @@ Depends: ${python3:Depends}, ca-certificates, python3-chardet, - python3-urllib3 (>= 1.5) + python3-urllib3 (>= 1.9.1) Suggests: python3-ndg-httpsclient, python3-openssl, -- cgit v1.2.3 From 61d17a1ac5b4f66a634a5bdc203ce0efe2f36d14 Mon Sep 17 00:00:00 2001 From: Piotr Ożarowski Date: Tue, 21 Oct 2014 08:34:23 +0000 Subject: s/UNRELEASED/unstable/ --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3d98479..8f58fb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -requests (2.4.3-1) UNRELEASED; urgency=medium +requests (2.4.3-1) unstable; urgency=medium * New upstream release. * debian/control -- cgit v1.2.3