summaryrefslogtreecommitdiff
path: root/designateclient
diff options
context:
space:
mode:
authorGraham Hayes <gr@ham.ie>2018-04-10 15:08:56 +0100
committerGraham Hayes <gr@ham.ie>2018-04-16 16:01:16 +0100
commitc0543004d06825c5b3d5f6f91b0ba2ad470fbf9c (patch)
treea08183fc7d6aeef0d59bd678ea7a762addb9681c /designateclient
parent6eeef0dd24e0787f6c2c58f63ae27872ad22ac47 (diff)
downloadpython-designateclient-c0543004d06825c5b3d5f6f91b0ba2ad470fbf9c.tar.gz
Check item is one of six.string_types not just str
Change-Id: I343d9f6bdb3509256191a44e686f24e0ebeb5d22 Closes-Bug: #1762612
Diffstat (limited to 'designateclient')
-rw-r--r--designateclient/v2/cli/common.py3
-rw-r--r--designateclient/v2/cli/zones.py2
2 files changed, 2 insertions, 3 deletions
diff --git a/designateclient/v2/cli/common.py b/designateclient/v2/cli/common.py
index ca66754..fb18df4 100644
--- a/designateclient/v2/cli/common.py
+++ b/designateclient/v2/cli/common.py
@@ -13,6 +13,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
+import six
def add_all_projects_option(parser):
@@ -70,5 +71,5 @@ def set_all_common_headers(client, parsed_args):
set_edit_managed(client, parsed_args.edit_managed)
if parsed_args.sudo_project_id is not None and \
- isinstance(parsed_args.sudo_project_id, str):
+ isinstance(parsed_args.sudo_project_id, six.string_types):
set_sudo_project_id(client, parsed_args.sudo_project_id)
diff --git a/designateclient/v2/cli/zones.py b/designateclient/v2/cli/zones.py
index 3782652..7511b0e 100644
--- a/designateclient/v2/cli/zones.py
+++ b/designateclient/v2/cli/zones.py
@@ -70,8 +70,6 @@ class ListZonesCommand(command.Lister):
client = self.app.client_manager.dns
common.set_all_common_headers(client, parsed_args)
- common.set_all_common_headers(client, parsed_args)
-
criterion = {}
if parsed_args.type is not None:
criterion["type"] = parsed_args.type