[Python-modules-commits] r31855 - in packages/lazr.restfulclient/trunk/debian (4 files)

[xnox at users.alioth.debian.org]

    Date: Thursday, February 12, 2015 @ 23:38:42
  Author: xnox
Revision: 31855

* Decode headers before comparison (LP: #1414075)
* Fix urllib unquote imports (LP: #1414055)

Added:
  packages/lazr.restfulclient/trunk/debian/patches/lp1414055.patch
  packages/lazr.restfulclient/trunk/debian/patches/lp1414075.patch
Modified:
  packages/lazr.restfulclient/trunk/debian/changelog
  packages/lazr.restfulclient/trunk/debian/patches/series

Modified: packages/lazr.restfulclient/trunk/debian/changelog
===================================================================
--- packages/lazr.restfulclient/trunk/debian/changelog	2015-02-12 21:27:37 UTC (rev 31854)
+++ packages/lazr.restfulclient/trunk/debian/changelog	2015-02-12 23:38:42 UTC (rev 31855)
@@ -1,6 +1,8 @@
 lazr.restfulclient (0.13.4-3) UNRELEASED; urgency=medium
 
   * Fix json loads (LP: #1403524).
+  * Decode headers before comparison (LP: #1414075)
+  * Fix urllib unquote imports (LP: #1414055)
 
  -- Dimitri John Ledkov <dimitri.j.ledkov at linux.intel.com>  Wed, 21 Jan 2015 18:57:29 +0000
 

Added: packages/lazr.restfulclient/trunk/debian/patches/lp1414055.patch
===================================================================
--- packages/lazr.restfulclient/trunk/debian/patches/lp1414055.patch	                        (rev 0)
+++ packages/lazr.restfulclient/trunk/debian/patches/lp1414055.patch	2015-02-12 23:38:42 UTC (rev 31855)
@@ -0,0 +1,32 @@
+Description: py23 urllib unquote
+Origin: commit, revision id: dimitri.j.ledkov at intel.com-20150212233334-idqx90kr3hg75x5o
+Author: Dimitri John Ledkov <dimitri.j.ledkov at intel.com>
+Bug: https://launchpad.net/bugs/1414055
+Last-Update: 2015-02-12
+X-Bzr-Revision-Id: dimitri.j.ledkov at intel.com-20150212233334-idqx90kr3hg75x5o
+
+=== modified file 'src/lazr/restfulclient/resource.py'
+--- old/src/lazr/restfulclient/resource.py	2015-01-21 18:50:19 +0000
++++ new/src/lazr/restfulclient/resource.py	2015-02-12 23:33:34 +0000
+@@ -48,9 +48,10 @@
+ 
+ try:
+     # Python 3.
+-    from urllib.parse import urljoin, urlparse, parse_qs
++    from urllib.parse import urljoin, urlparse, parse_qs, unquote
+ except ImportError:
+     from urlparse import urljoin, urlparse, parse_qs
++    from urllib import unquote
+ 
+ import types
+ import urllib
+@@ -1082,7 +1083,7 @@
+             # file.
+             content_location = response['content-location']
+             path = urlparse(content_location)[2]
+-            filename = urllib.unquote(path.split("/")[-1])
++            filename = unquote(path.split("/")[-1])
+         elif mode == 'w':
+             value = ''
+             if content_type is None:
+

Added: packages/lazr.restfulclient/trunk/debian/patches/lp1414075.patch
===================================================================
--- packages/lazr.restfulclient/trunk/debian/patches/lp1414075.patch	                        (rev 0)
+++ packages/lazr.restfulclient/trunk/debian/patches/lp1414075.patch	2015-02-12 23:38:42 UTC (rev 31855)
@@ -0,0 +1,20 @@
+Description: Decode header before comparison.
+Origin: commit, revision id: dimitri.j.ledkov at intel.com-20150131110442-lagqk2kjcnh1017v
+Author: Dimitri John Ledkov <dimitri.j.ledkov at intel.com>
+Bug: https://launchpad.net/bugs/1414075
+Last-Update: 2015-01-31
+X-Bzr-Revision-Id: dimitri.j.ledkov at intel.com-20150131110442-lagqk2kjcnh1017v
+
+=== modified file 'src/lazr/restfulclient/_browser.py'
+--- old/src/lazr/restfulclient/_browser.py	2014-12-05 23:29:22 +0000
++++ new/src/lazr/restfulclient/_browser.py	2015-01-31 11:04:42 +0000
+@@ -318,6 +318,8 @@
+         (scheme, authority, request_uri, cachekey) = urlnorm(uri)
+         cached_value = self.get(cachekey)
+         header_start = header + ':'
++        if not isinstance(header_start, bytes):
++            header_start = header_start.encode('utf-8')
+         if cached_value is not None:
+             for line in BytesIO(cached_value):
+                 if line.startswith(header_start):
+

Modified: packages/lazr.restfulclient/trunk/debian/patches/series
===================================================================
--- packages/lazr.restfulclient/trunk/debian/patches/series	2015-02-12 21:27:37 UTC (rev 31854)
+++ packages/lazr.restfulclient/trunk/debian/patches/series	2015-02-12 23:38:42 UTC (rev 31855)
@@ -1 +1,3 @@
 lp1403524.patch
+lp1414075.patch
+lp1414055.patch