[Python-modules-commits] r26189 - in packages/requests/trunk/debian (2 files)

[eriol-guest at users.alioth.debian.org]

    Date: Thursday, October 17, 2013 @ 20:06:15
  Author: eriol-guest
Revision: 26189

Refreshed 02_use-system-chardet-and-urllib3.patch

Modified:
  packages/requests/trunk/debian/changelog
  packages/requests/trunk/debian/patches/02_use-system-chardet-and-urllib3.patch

Modified: packages/requests/trunk/debian/changelog
===================================================================
--- packages/requests/trunk/debian/changelog	2013-10-17 16:37:03 UTC (rev 26188)
+++ packages/requests/trunk/debian/changelog	2013-10-17 20:06:15 UTC (rev 26189)
@@ -1,10 +1,12 @@
 requests (2.0.0-1) UNRELEASED; urgency=low
 
   * New upstream release (Closes: #725784)
+  * debian/patches/02_use-system-chardet-and-urllib3.patches
+    - Refreshed
   * debian/watch
     - Switched download URL to https
 
- -- Daniele Tricoli <eriol at mornie.org>  Thu, 17 Oct 2013 16:00:13 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Thu, 17 Oct 2013 22:05:07 +0200
 
 requests (1.2.3-1) unstable; urgency=low
 

Modified: packages/requests/trunk/debian/patches/02_use-system-chardet-and-urllib3.patch
===================================================================
--- packages/requests/trunk/debian/patches/02_use-system-chardet-and-urllib3.patch	2013-10-17 16:37:03 UTC (rev 26188)
+++ packages/requests/trunk/debian/patches/02_use-system-chardet-and-urllib3.patch	2013-10-17 20:06:15 UTC (rev 26189)
@@ -2,21 +2,23 @@
  embedded copies.
 Author: Daniele Tricoli <eriol at 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 @@
      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 @@
 -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 @@