From 785efd32187031a7f593be863706ff26dfe5b390 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 25 Apr 2013 23:14:32 +0000 Subject: * New upstream version. * Refreshed bowth debian-specific patches. --- debian/changelog | 7 ++++ debian/patches/01_use-system-ca-certificates.patch | 14 +++---- .../02_use-system-chardet-and-urllib3.patch | 47 +++++++++++----------- 3 files changed, 37 insertions(+), 31 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8aed937..3ddefd4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +requests (1.2.0-1) experimental; urgency=low + + * New upstream version. + * Refreshed bowth debian-specific patches. + + -- Thomas Goirand Thu, 25 Apr 2013 22:56:42 +0000 + requests (1.1.0-1) experimental; urgency=low * New upstream release (Closes: #692602) diff --git a/debian/patches/01_use-system-ca-certificates.patch b/debian/patches/01_use-system-ca-certificates.patch index 5fec645..f079c99 100644 --- a/debian/patches/01_use-system-ca-certificates.patch +++ b/debian/patches/01_use-system-ca-certificates.patch @@ -4,15 +4,15 @@ Author: Daniele Tricoli Forwarded: not-needed Last-Update: 2013-01-19 ---- a/requests/certs.py -+++ b/requests/certs.py -@@ -25,7 +25,7 @@ - if certifi: - return certifi.where() - +--- a/requests/certs.py 2013-04-25 22:54:02.000000000 +0000 ++++ b/requests/certs.py 2013-04-25 22:54:34.000000000 +0000 +@@ -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' - + if __name__ == '__main__': print(where()) --- a/setup.py diff --git a/debian/patches/02_use-system-chardet-and-urllib3.patch b/debian/patches/02_use-system-chardet-and-urllib3.patch index 62d14ef..14636c4 100644 --- a/debian/patches/02_use-system-chardet-and-urllib3.patch +++ b/debian/patches/02_use-system-chardet-and-urllib3.patch @@ -4,20 +4,19 @@ Author: Daniele Tricoli Forwarded: not-needed Last-Update: 2013-01-19 ---- a/requests/adapters.py -+++ b/requests/adapters.py -@@ -11,17 +11,17 @@ +--- a/requests/adapters.py 2013-03-22 04:09:32.000000000 +0000 ++++ b/requests/adapters.py 2013-04-25 23:00:25.000000000 +0000 +@@ -11,16 +11,16 @@ import socket - + from .models import Response --from .packages.urllib3.poolmanager import PoolManager, proxy_from_url +-from .packages.urllib3.poolmanager import PoolManager, ProxyManager -from .packages.urllib3.response import HTTPResponse +from urllib3.poolmanager import PoolManager, proxy_from_url +from urllib3.response import HTTPResponse - from .hooks import dispatch_hook - from .compat import urlparse, basestring, urldefrag + from .compat import urlparse, basestring, urldefrag, unquote from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers, - prepend_scheme_if_needed) + prepend_scheme_if_needed, get_auth_from_url) from .structures import CaseInsensitiveDict -from .packages.urllib3.exceptions import MaxRetryError -from .packages.urllib3.exceptions import TimeoutError @@ -29,49 +28,49 @@ Last-Update: 2013-01-19 +from urllib3.exceptions import HTTPError as _HTTPError from .cookies import extract_cookies_to_jar from .exceptions import ConnectionError, Timeout, SSLError - ---- a/requests/compat.py -+++ b/requests/compat.py + from .auth import _basic_auth_str +--- a/requests/compat.py 2013-01-31 13:18:16.000000000 +0000 ++++ b/requests/compat.py 2013-04-25 23:04:23.000000000 +0000 @@ -4,7 +4,7 @@ pythoncompat """ - + -from .packages import charade as chardet +import chardet - + import sys - + @@ -89,7 +89,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 - + builtin_str = str bytes = str ---- a/requests/models.py -+++ b/requests/models.py +--- a/requests/models.py 2013-03-31 05:22:03.000000000 +0000 ++++ b/requests/models.py 2013-04-25 23:07:32.000000000 +0000 @@ -17,7 +17,7 @@ - + from .auth import HTTPBasicAuth from .cookies import cookiejar_from_dict, get_cookie_header -from .packages.urllib3.filepost import encode_multipart_formdata +from urllib3.filepost import encode_multipart_formdata from .exceptions import HTTPError, RequestException, MissingSchema, InvalidURL from .utils import ( - stream_untransfer, guess_filename, requote_uri, ---- a/setup.py -+++ b/setup.py + stream_untransfer, guess_filename, get_auth_from_url, requote_uri, +--- a/setup.py 2013-01-24 01:08:39.000000000 +0000 ++++ b/setup.py 2013-04-25 23:09:21.000000000 +0000 @@ -16,11 +16,6 @@ - + packages = [ 'requests', - 'requests.packages', -- 'requests.packages.charade', +- 'requests.packages.charade', - 'requests.packages.urllib3', - 'requests.packages.urllib3.packages', - 'requests.packages.urllib3.packages.ssl_match_hostname' ] - + requires = [] -- cgit v1.2.3