[Python-modules-commits] [lazr.restfulclient] 03/07: Cherry-pick from upstream: Update imports for urlencode.

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository lazr.restfulclient.

commit 922c1612fb8bf1c3a6b95a1f784c81728aca2989
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Thu May 19 09:20:28 2016 +0000

    Cherry-pick from upstream: Update imports for urlencode.
    
    Thanks: Dimitri John Ledkov for the patch.
    LP: #1425609
---
 debian/changelog               |  4 ++++
 debian/patches/lp1425609.patch | 35 +++++++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 3 files changed, 40 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a761e13..18a1918 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ lazr.restfulclient (0.13.4-6) UNRELEASED; urgency=medium
   * git-dpm config.
   * Update Vcs fields for git migration.
 
+  [ Mattia Rizzolo ]
+  * Cherry-pick from upstream: Update imports for urlencode.
+    Thanks to Dimitri John Ledkov for the patch.  LP: #1425609
+
  -- Ondřej Nový <novy at ondrej.org>  Tue, 29 Mar 2016 21:41:17 +0200
 
 lazr.restfulclient (0.13.4-5) unstable; urgency=medium
diff --git a/debian/patches/lp1425609.patch b/debian/patches/lp1425609.patch
new file mode 100644
index 0000000..6491b13
--- /dev/null
+++ b/debian/patches/lp1425609.patch
@@ -0,0 +1,35 @@
+Description: Update imports for urlencode
+Origin: upstream, http://bazaar.launchpad.net/+branch/lazr.restfulclient/revision/146
+Author: Dimitri John Ledkov <dimitri.j.ledkov at intel.com>
+Bug: https://bugs.launchpad.net/bugs/1425609
+Last-Update: 2016-04-19
+
+Index: b/src/lazr/restfulclient/resource.py
+===================================================================
+--- a/src/lazr/restfulclient/resource.py
++++ b/src/lazr/restfulclient/resource.py
+@@ -48,13 +48,12 @@
+ 
+ try:
+     # Python 3.
+-    from urllib.parse import urljoin, urlparse, parse_qs, unquote
++    from urllib.parse import urljoin, urlparse, parse_qs, unquote, urlencode
+ except ImportError:
+     from urlparse import urljoin, urlparse, parse_qs
+-    from urllib import unquote
++    from urllib import unquote, urlencode
+ 
+ import types
+-import urllib
+ 
+ import sys
+ if sys.version_info[0] >= 3:
+@@ -973,7 +972,7 @@
+         else:
+             params = parse_qs(uri.query)
+         params[variable] = str(new_value)
+-        uri.query = urllib.urlencode(params, True)
++        uri.query = urlencode(params, True)
+         return str(uri)
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0d57833..999c587 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 lp1403524.patch
 lp1414075.patch
 lp1414055.patch
+lp1425609.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/lazr.restfulclient.git