import urlencode() from six.moves.urllib.parse instead of from urllib (#268)

Cosimo Lupo · Gauvain Pocentek · commit 88900e067617 · 2017-06-02T15:41:06.000+02:00
Fixes AttributeError on Python 3, as `urlencode` function has been moved to `urllib.parse` module.

`six.moves.urllib.parse.urlencode()` is an py2.py3 compatible alias of `urllib.parse.urlencode()` on Python 3, and of `urllib.urlencode()` on Python 2.
diff --git a/gitlab/v3/objects.py b/gitlab/v3/objects.py
@@ -20,10 +20,10 @@
 from __future__ import absolute_import
 import base64
 import json
-import urllib
 import warnings
 
 import six
+from six.moves import urllib
 
 import gitlab
 from gitlab.base import *  # noqa
@@ -1841,7 +1841,7 @@ def repository_tree(self, path='', ref_name='', **kwargs):
         url = "/projects/%s/repository/tree" % (self.id)
         params = []
         if path:
-            params.append(urllib.urlencode({'path': path}))
+            params.append(urllib.parse.urlencode({'path': path}))
         if ref_name:
             params.append("ref_name=%s" % ref_name)
         if params:
@@ -1872,7 +1872,7 @@ def repository_blob(self, sha, filepath, streamed=False, action=None,
             GitlabGetError: If the server fails to perform the request.
         """
         url = "/projects/%s/repository/blobs/%s" % (self.id, sha)
-        url += '?%s' % (urllib.urlencode({'filepath': filepath}))
+        url += '?%s' % (urllib.parse.urlencode({'filepath': filepath}))
         r = self.gitlab._raw_get(url, streamed=streamed, **kwargs)
         raise_error_from_response(r, GitlabGetError)
         return utils.response_content(r, streamed, action, chunk_size)
diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py
@@ -20,9 +20,9 @@
 from __future__ import absolute_import
 import base64
 import json
-import urllib
 
 import six
+from six.moves import urllib
 
 import gitlab
 from gitlab.base import *  # noqa
@@ -1846,7 +1846,7 @@ def repository_tree(self, path='', ref='', **kwargs):
         url = "/projects/%s/repository/tree" % (self.id)
         params = []
         if path:
-            params.append(urllib.urlencode({'path': path}))
+            params.append(urllib.parse.urlencode({'path': path}))
         if ref:
             params.append("ref=%s" % ref)
         if params:
