Fix url quoting with non-ascii (closes bug #3256)

diff --git a/kamaki/clients/__init__.py b/kamaki/clients/__init__.py
index 433b023..5ffe57f 100644 (file)
--- a/kamaki/clients/__init__.py
+++ b/kamaki/clients/__init__.py
@@ -194,7 +194,7 @@ class Client(object):
             sendlog.info('perform a %s @ %s', method, self.base_url)
 
             self.http_client.url = self.base_url
-            self.http_client.path = quote(path)
+            self.http_client.path = quote(path.encode('utf8'))
             r = self.http_client.perform_request(
                 method,
                 data,

diff --git a/kamaki/clients/utils.py b/kamaki/clients/utils.py
index 5daf23c..e2f2e5a 100644 (file)
--- a/kamaki/clients/utils.py
+++ b/kamaki/clients/utils.py
@@ -87,19 +87,8 @@ def path4url(*args):
     :returns: (str) a path in the form /args[0]/args[1]/...
     """
 
-    path = ''
-    for arg in args:
-        suffix = '%s' % arg
-        try:
-            while suffix[0] == '/':
-                suffix = '%s' % suffix[1:]
-        except IndexError:
-            continue
-        if len(path) > 0 and path[-1] == '/':
-            path += '%s' % suffix
-        else:
-            path += '/%s' % suffix
-    return path
+    return '/'.join([''] + [arg.decode('utf-8') if (
+        isinstance(arg, str)) else '%s' % arg for arg in args])
 
 
 def params4url(params):

diff --git a/version b/version
index 4b7e8b5..c17c572 100644 (file)
--- a/version
+++ b/version
@@ -1,5 +1 @@
-<<<<<<< HEAD
 0.7next
-=======
-0.7.1
->>>>>>> hotfix-0.7.1