From a0eafcb093933ef409adb7a9192c3e0fc1e6a481 Mon Sep 17 00:00:00 2001 From: Pradeep Kumar Singh Date: Thu, 23 Jul 2015 13:51:13 +0900 Subject: [PATCH] Fix py3 compatibilty issues 1. replace urllib with six.moves.urllib 2. replace basestring with six.string_types Change-Id: I92dbbdb149ed35e1623184eb7a93162b5cc0bfb6 --- designateclient/client.py | 4 ++-- designateclient/v2/recordsets.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) 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