diff --git a/designateclient/client.py b/designateclient/client.py
index 6140c91..2cee742 100644
--- a/designateclient/client.py
+++ b/designateclient/client.py
@@ -15,9 +15,9 @@
 # under the License.
 import abc
 import json
-from urllib import urlencode
 
 import six
+from six.moves.urllib import parse
 from stevedore import extension
 
 from designateclient import exceptions
@@ -37,7 +37,7 @@ class Controller(object):
         if limit is not None:
             params['limit'] = limit
 
-        q = urlencode(params) if params else ''
+        q = parse.urlencode(params) if params else ''
         return '%(url)s%(params)s' % {
             'url': url,
             'params': '?%s' % q
diff --git a/designateclient/v2/recordsets.py b/designateclient/v2/recordsets.py
index 7b5e14d..eab96ee 100644
--- a/designateclient/v2/recordsets.py
+++ b/designateclient/v2/recordsets.py
@@ -14,6 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 from oslo_utils import uuidutils
+import six
 
 from designateclient import client
 from designateclient.v2 import utils as v2_utils
@@ -24,8 +25,9 @@ class RecordSetController(client.Controller):
         zone_info = None
 
         # If we get a zone name we'll need to get the ID of it before POST.
-        if isinstance(zone, basestring) and not uuidutils.is_uuid_like(zone):
-            zone_info = self.client.zones.get(zone)
+        if isinstance(zone, six.string_types) and not \
+                uuidutils.is_uuid_like(zone):
+                zone_info = self.client.zones.get(zone)
         elif isinstance(zone, dict):
             zone_info = zone