aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog5
-rw-r--r--debian/patches/02_use-system-chardet-and-urllib3.patch42
2 files changed, 27 insertions, 20 deletions
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 <eriol@mornie.org> Wed, 08 Oct 2014 19:46:37 +0200
+ -- Daniele Tricoli <eriol@mornie.org> 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 <eriol@mornie.org>
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',