summaryrefslogtreecommitdiff
path: root/designateclient/v2/cli
diff options
context:
space:
mode:
Diffstat (limited to 'designateclient/v2/cli')
-rw-r--r--designateclient/v2/cli/blacklists.py7
-rw-r--r--designateclient/v2/cli/common.py3
-rw-r--r--designateclient/v2/cli/quotas.py5
-rw-r--r--designateclient/v2/cli/recordsets.py9
-rw-r--r--designateclient/v2/cli/reverse.py5
-rw-r--r--designateclient/v2/cli/service_statuses.py3
-rw-r--r--designateclient/v2/cli/tlds.py7
-rw-r--r--designateclient/v2/cli/tsigkeys.py7
-rw-r--r--designateclient/v2/cli/zones.py27
9 files changed, 32 insertions, 41 deletions
diff --git a/designateclient/v2/cli/blacklists.py b/designateclient/v2/cli/blacklists.py
index ce6ec91..11f6640 100644
--- a/designateclient/v2/cli/blacklists.py
+++ b/designateclient/v2/cli/blacklists.py
@@ -17,7 +17,6 @@
import logging
from osc_lib.command import command
-import six
from designateclient import utils
from designateclient.v2.cli import common
@@ -70,7 +69,7 @@ class ShowBlacklistCommand(command.ShowOne):
common.set_all_common_headers(client, parsed_args)
data = client.blacklists.get(parsed_args.id)
_format_blacklist(data)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class CreateBlacklistCommand(command.ShowOne):
@@ -95,7 +94,7 @@ class CreateBlacklistCommand(command.ShowOne):
parsed_args.pattern, parsed_args.description)
_format_blacklist(data)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class SetBlacklistCommand(command.ShowOne):
@@ -132,7 +131,7 @@ class SetBlacklistCommand(command.ShowOne):
updated = client.blacklists.update(parsed_args.id, data)
_format_blacklist(updated)
- return six.moves.zip(*sorted(six.iteritems(updated)))
+ return zip(*sorted(updated.items()))
class DeleteBlacklistCommand(command.Command):
diff --git a/designateclient/v2/cli/common.py b/designateclient/v2/cli/common.py
index fb18df4..ca66754 100644
--- a/designateclient/v2/cli/common.py
+++ b/designateclient/v2/cli/common.py
@@ -13,7 +13,6 @@
# 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):
@@ -71,5 +70,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, six.string_types):
+ isinstance(parsed_args.sudo_project_id, str):
set_sudo_project_id(client, parsed_args.sudo_project_id)
diff --git a/designateclient/v2/cli/quotas.py b/designateclient/v2/cli/quotas.py
index 76ea7f6..c015080 100644
--- a/designateclient/v2/cli/quotas.py
+++ b/designateclient/v2/cli/quotas.py
@@ -18,7 +18,6 @@ import logging
from cliff import command
from cliff import show
-import six
from designateclient.v2.cli import common
@@ -60,7 +59,7 @@ class ListQuotasCommand(show.ShowOne):
common.set_all_projects(client, True)
data = client.quotas.list(proj_id)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class SetQuotasCommand(show.ShowOne):
@@ -104,7 +103,7 @@ class SetQuotasCommand(show.ShowOne):
updated = client.quotas.update(proj_id, quotas)
- return six.moves.zip(*sorted(six.iteritems(updated)))
+ return zip(*sorted(updated.items()))
class ResetQuotasCommand(command.Command):
diff --git a/designateclient/v2/cli/recordsets.py b/designateclient/v2/cli/recordsets.py
index 229c346..f764454 100644
--- a/designateclient/v2/cli/recordsets.py
+++ b/designateclient/v2/cli/recordsets.py
@@ -18,7 +18,6 @@ import argparse
import logging
from osc_lib.command import command
-import six
from designateclient import utils
from designateclient.v2.cli import common
@@ -135,7 +134,7 @@ class ShowRecordSetCommand(command.ShowOne):
data = client.recordsets.get(parsed_args.zone_id, parsed_args.id)
_format_recordset(data)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class CreateRecordSetCommand(command.ShowOne):
@@ -182,7 +181,7 @@ class CreateRecordSetCommand(command.ShowOne):
ttl=parsed_args.ttl)
_format_recordset(data)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class SetRecordSetCommand(command.ShowOne):
@@ -246,7 +245,7 @@ class SetRecordSetCommand(command.ShowOne):
_format_recordset(updated)
- return six.moves.zip(*sorted(six.iteritems(updated)))
+ return zip(*sorted(updated.items()))
class DeleteRecordSetCommand(command.ShowOne):
@@ -270,4 +269,4 @@ class DeleteRecordSetCommand(command.ShowOne):
LOG.info('RecordSet %s was deleted', parsed_args.id)
_format_recordset(data)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
diff --git a/designateclient/v2/cli/reverse.py b/designateclient/v2/cli/reverse.py
index 6cbe5bf..11d5383 100644
--- a/designateclient/v2/cli/reverse.py
+++ b/designateclient/v2/cli/reverse.py
@@ -17,7 +17,6 @@
import logging
from osc_lib.command import command
-import six
from designateclient import utils
from designateclient.v2.cli import common
@@ -71,7 +70,7 @@ class ShowFloatingIPCommand(command.ShowOne):
common.set_all_common_headers(client, parsed_args)
data = client.floatingips.get(parsed_args.floatingip_id)
_format_floatingip(data)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class SetFloatingIPCommand(command.ShowOne):
@@ -119,7 +118,7 @@ class SetFloatingIPCommand(command.ShowOne):
parsed_args.ttl)
_format_floatingip(fip)
- return six.moves.zip(*sorted(six.iteritems(fip)))
+ return zip(*sorted(fip.items()))
class UnsetFloatingIPCommand(command.Command):
diff --git a/designateclient/v2/cli/service_statuses.py b/designateclient/v2/cli/service_statuses.py
index a4bd272..c7b4179 100644
--- a/designateclient/v2/cli/service_statuses.py
+++ b/designateclient/v2/cli/service_statuses.py
@@ -17,7 +17,6 @@
import logging
from osc_lib.command import command
-import six
from designateclient import utils
from designateclient.v2.cli import common
@@ -91,4 +90,4 @@ class ShowServiceStatusCommand(command.ShowOne):
data = client.service_statuses.get(parsed_args.id)
_format_status(data)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
diff --git a/designateclient/v2/cli/tlds.py b/designateclient/v2/cli/tlds.py
index c41a477..de0537b 100644
--- a/designateclient/v2/cli/tlds.py
+++ b/designateclient/v2/cli/tlds.py
@@ -17,7 +17,6 @@
import logging
from osc_lib.command import command
-import six
from designateclient import utils
from designateclient.v2.cli import common
@@ -75,7 +74,7 @@ class ShowTLDCommand(command.ShowOne):
common.set_all_common_headers(client, parsed_args)
data = client.tlds.get(parsed_args.id)
_format_tld(data)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class CreateTLDCommand(command.ShowOne):
@@ -96,7 +95,7 @@ class CreateTLDCommand(command.ShowOne):
common.set_all_common_headers(client, parsed_args)
data = client.tlds.create(parsed_args.name, parsed_args.description)
_format_tld(data)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class SetTLDCommand(command.ShowOne):
@@ -131,7 +130,7 @@ class SetTLDCommand(command.ShowOne):
data = client.tlds.update(parsed_args.id, data)
_format_tld(data)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class DeleteTLDCommand(command.Command):
diff --git a/designateclient/v2/cli/tsigkeys.py b/designateclient/v2/cli/tsigkeys.py
index b1d42ad..587dfe7 100644
--- a/designateclient/v2/cli/tsigkeys.py
+++ b/designateclient/v2/cli/tsigkeys.py
@@ -17,7 +17,6 @@
import logging
from osc_lib.command import command
-import six
from designateclient import utils
from designateclient.v2.cli import common
@@ -83,7 +82,7 @@ class ShowTSIGKeyCommand(command.ShowOne):
common.set_all_common_headers(client, parsed_args)
data = client.tsigkeys.get(parsed_args.id)
_format_tsigkey(data)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class CreateTSIGKeyCommand(command.ShowOne):
@@ -111,7 +110,7 @@ class CreateTSIGKeyCommand(command.ShowOne):
parsed_args.secret, parsed_args.scope,
parsed_args.resource_id)
_format_tsigkey(data)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class SetTSIGKeyCommand(command.ShowOne):
@@ -147,7 +146,7 @@ class SetTSIGKeyCommand(command.ShowOne):
data = client.tsigkeys.update(parsed_args.id, data)
_format_tsigkey(data)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class DeleteTSIGKeyCommand(command.Command):
diff --git a/designateclient/v2/cli/zones.py b/designateclient/v2/cli/zones.py
index 4d26579..9eda63e 100644
--- a/designateclient/v2/cli/zones.py
+++ b/designateclient/v2/cli/zones.py
@@ -18,7 +18,6 @@ import logging
from osc_lib.command import command
from osc_lib import exceptions as osc_exc
-import six
from designateclient import utils
from designateclient.v2.cli import common
@@ -121,7 +120,7 @@ class ShowZoneCommand(command.ShowOne):
data = client.zones.get(parsed_args.id)
_format_zone(data)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class CreateZoneCommand(command.ShowOne):
@@ -186,7 +185,7 @@ class CreateZoneCommand(command.ShowOne):
parsed_args.name, parsed_args.type, **payload)
_format_zone(data)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class SetZoneCommand(command.ShowOne):
@@ -231,7 +230,7 @@ class SetZoneCommand(command.ShowOne):
updated = client.zones.update(parsed_args.id, data)
_format_zone(updated)
- return six.moves.zip(*sorted(six.iteritems(updated)))
+ return zip(*sorted(updated.items()))
class DeleteZoneCommand(command.ShowOne):
@@ -254,7 +253,7 @@ class DeleteZoneCommand(command.ShowOne):
LOG.info('Zone %s was deleted', parsed_args.id)
_format_zone(data)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class AbandonZoneCommand(command.Command):
@@ -323,7 +322,7 @@ class CreateTransferRequestCommand(command.ShowOne):
data = client.zone_transfers.create_request(
parsed_args.zone_id, parsed_args.target_project_id,
parsed_args.description)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class ListTransferRequestsCommand(command.Lister):
@@ -368,7 +367,7 @@ class ShowTransferRequestCommand(command.ShowOne):
data = client.zone_transfers.get_request(parsed_args.id)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class SetTransferRequestCommand(command.ShowOne):
@@ -398,7 +397,7 @@ class SetTransferRequestCommand(command.ShowOne):
data['description'] = parsed_args.description
updated = client.zone_transfers.update_request(parsed_args.id, data)
- return six.moves.zip(*sorted(six.iteritems(updated)))
+ return zip(*sorted(updated.items()))
class DeleteTransferRequestCommand(command.Command):
@@ -444,7 +443,7 @@ class AcceptTransferRequestCommand(command.ShowOne):
data = client.zone_transfers.accept_request(
parsed_args.transfer_id, parsed_args.key)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class ListTransferAcceptsCommand(command.Lister):
@@ -489,7 +488,7 @@ class ShowTransferAcceptCommand(command.ShowOne):
data = client.zone_transfers.get_accept(parsed_args.id)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class ExportZoneCommand(command.ShowOne):
@@ -514,7 +513,7 @@ class ExportZoneCommand(command.ShowOne):
LOG.info('Zone Export %s was created', data['id'])
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class ListZoneExportsCommand(command.Lister):
@@ -567,7 +566,7 @@ class ShowZoneExportCommand(command.ShowOne):
parsed_args.zone_export_id)
_format_zone_export_record(data)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class DeleteZoneExportCommand(command.Command):
@@ -640,7 +639,7 @@ class ImportZoneCommand(command.ShowOne):
LOG.info('Zone Import %s was created', data['id'])
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class ListZoneImportsCommand(command.Lister):
@@ -694,7 +693,7 @@ class ShowZoneImportCommand(command.ShowOne):
parsed_args.zone_import_id)
_format_zone_import_record(data)
- return six.moves.zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class DeleteZoneImportCommand(command.Command):
View Lorry Controller Status