diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2013-10-17 20:06:15 +0000 |
|---|---|---|
| committer | Daniele Tricoli <eriol@mornie.org> | 2013-10-17 20:06:15 +0000 |
| commit | 3b05ddff398a516c9effd279f214e66414641091 (patch) | |
| tree | 516c3bcae0e1600fcb31c79e283cded4650f0e5c /debian/patches | |
| parent | 7d6337392cddd1436de0d0554f6cb1d37c9064b7 (diff) | |
| download | python-requests-3b05ddff398a516c9effd279f214e66414641091.tar python-requests-3b05ddff398a516c9effd279f214e66414641091.tar.gz | |
Refreshed 02_use-system-chardet-and-urllib3.patch
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/02_use-system-chardet-and-urllib3.patch | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/debian/patches/02_use-system-chardet-and-urllib3.patch b/debian/patches/02_use-system-chardet-and-urllib3.patch index 0079d37..0e2ce92 100644 --- a/debian/patches/02_use-system-chardet-and-urllib3.patch +++ b/debian/patches/02_use-system-chardet-and-urllib3.patch @@ -2,21 +2,23 @@ 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-06-21 +Last-Update: 2013-10-17 --- a/requests/adapters.py +++ b/requests/adapters.py -@@ -11,16 +11,16 @@ +@@ -11,17 +11,17 @@ import socket from .models import Response --from .packages.urllib3.poolmanager import PoolManager, ProxyManager +-from .packages.urllib3.poolmanager import PoolManager, proxy_from_url -from .packages.urllib3.response import HTTPResponse -+from urllib3.poolmanager import PoolManager, ProxyManager +-from .packages.urllib3.util import Timeout as TimeoutSauce ++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 .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers, - prepend_scheme_if_needed, get_auth_from_url) + except_on_missing_scheme, get_auth_from_url) from .structures import CaseInsensitiveDict -from .packages.urllib3.exceptions import MaxRetryError -from .packages.urllib3.exceptions import TimeoutError @@ -46,9 +48,9 @@ Last-Update: 2013-06-21 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 @@ -17,8 +17,8 @@ @@ -59,9 +61,9 @@ Last-Update: 2013-06-21 -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 ( - guess_filename, get_auth_from_url, requote_uri, + from .exceptions import ( + HTTPError, RequestException, MissingSchema, InvalidURL, + ChunkedEncodingError) --- a/setup.py +++ b/setup.py @@ -16,12 +16,6 @@ |