diff options
Diffstat (limited to 'troveclient/osc')
| -rw-r--r-- | troveclient/osc/v1/database_backups.py | 5 | ||||
| -rw-r--r-- | troveclient/osc/v1/database_clusters.py | 5 | ||||
| -rw-r--r-- | troveclient/osc/v1/database_configurations.py | 9 | ||||
| -rw-r--r-- | troveclient/osc/v1/database_instances.py | 5 | ||||
| -rw-r--r-- | troveclient/osc/v1/database_logs.py | 5 | ||||
| -rw-r--r-- | troveclient/osc/v1/database_quota.py | 3 | ||||
| -rw-r--r-- | troveclient/osc/v1/database_root.py | 5 | ||||
| -rw-r--r-- | troveclient/osc/v1/database_users.py | 3 | ||||
| -rw-r--r-- | troveclient/osc/v1/datastores.py | 5 |
9 files changed, 18 insertions, 27 deletions
diff --git a/troveclient/osc/v1/database_backups.py b/troveclient/osc/v1/database_backups.py index 9525ed0..6cfaf8e 100644 --- a/troveclient/osc/v1/database_backups.py +++ b/troveclient/osc/v1/database_backups.py @@ -15,7 +15,6 @@ from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils as osc_utils -import six from troveclient.i18n import _ @@ -167,7 +166,7 @@ class ShowDatabaseBackup(command.ShowOne): database_backups = self.app.client_manager.database.backups backup = osc_utils.find_resource(database_backups, parsed_args.backup) backup = set_attributes_for_print_detail(backup) - return zip(*sorted(six.iteritems(backup))) + return zip(*sorted(backup.items())) class DeleteDatabaseBackup(command.Command): @@ -257,7 +256,7 @@ class CreateDatabaseBackup(command.ShowOne): swift_container=parsed_args.swift_container ) backup = set_attributes_for_print_detail(backup) - return zip(*sorted(six.iteritems(backup))) + return zip(*sorted(backup.items())) class DeleteDatabaseBackupExecution(command.Command): diff --git a/troveclient/osc/v1/database_clusters.py b/troveclient/osc/v1/database_clusters.py index 9955d4f..6e9f0ee 100644 --- a/troveclient/osc/v1/database_clusters.py +++ b/troveclient/osc/v1/database_clusters.py @@ -15,7 +15,6 @@ from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils -import six from troveclient.i18n import _ from troveclient.v1.shell import _parse_extended_properties @@ -103,7 +102,7 @@ class ShowDatabaseCluster(command.ShowOne): database_clusters = self.app.client_manager.database.clusters cluster = utils.find_resource(database_clusters, parsed_args.cluster) cluster = set_attributes_for_print_detail(cluster) - return zip(*sorted(six.iteritems(cluster))) + return zip(*sorted(cluster.items())) class DeleteDatabaseCluster(command.Command): @@ -200,7 +199,7 @@ class CreateDatabaseCluster(command.ShowOne): extended_properties=extended_properties, configuration=parsed_args.configuration) cluster = set_attributes_for_print_detail(cluster) - return zip(*sorted(six.iteritems(cluster))) + return zip(*sorted(cluster.items())) class ResetDatabaseClusterStatus(command.Command): diff --git a/troveclient/osc/v1/database_configurations.py b/troveclient/osc/v1/database_configurations.py index a1a1c44..6989576 100644 --- a/troveclient/osc/v1/database_configurations.py +++ b/troveclient/osc/v1/database_configurations.py @@ -15,7 +15,6 @@ import json from osc_lib.command import command from osc_lib import utils as osc_utils -import six from troveclient import exceptions from troveclient.i18n import _ @@ -81,7 +80,7 @@ class ShowDatabaseConfiguration(command.ShowOne): configuration = osc_utils.find_resource( db_configurations, parsed_args.configuration_group) configuration = set_attributes_for_print_detail(configuration) - return zip(*sorted(six.iteritems(configuration))) + return zip(*sorted(configuration.items())) class ListDatabaseConfigurationParameters(command.Lister): @@ -177,7 +176,7 @@ class ShowDatabaseConfigurationParameter(command.ShowOne): ' parameter for the' ' configuration group' ' by name.')) - return zip(*sorted(six.iteritems(param._info))) + return zip(*sorted(param._info.items())) class DeleteDatabaseConfiguration(command.Command): @@ -252,7 +251,7 @@ class CreateDatabaseConfiguration(command.ShowOne): datastore=parsed_args.datastore, datastore_version=parsed_args.datastore_version) config_grp = set_attributes_for_print_detail(config_grp) - return zip(*sorted(six.iteritems(config_grp))) + return zip(*sorted(config_grp.items())) class AttachDatabaseConfiguration(command.Command): @@ -371,7 +370,7 @@ class DefaultDatabaseConfiguration(command.ShowOne): instance = osc_utils.find_resource(db_instances, parsed_args.instance) configs = db_instances.configuration(instance) - return zip(*sorted(six.iteritems(configs._info['configuration']))) + return zip(*sorted(configs._info['configuration'].items())) class SetDatabaseConfiguration(command.Command): diff --git a/troveclient/osc/v1/database_instances.py b/troveclient/osc/v1/database_instances.py index d16afd6..b3e916b 100644 --- a/troveclient/osc/v1/database_instances.py +++ b/troveclient/osc/v1/database_instances.py @@ -13,7 +13,6 @@ """Database v1 Instances action implementations""" import argparse -import six from osc_lib.command import command from osc_lib import exceptions @@ -174,7 +173,7 @@ class ShowDatabaseInstance(command.ShowOne): db_instances = self.app.client_manager.database.instances instance = osc_utils.find_resource(db_instances, parsed_args.instance) instance = set_attributes_for_print_detail(instance) - return zip(*sorted(six.iteritems(instance))) + return zip(*sorted(instance.items())) class DeleteDatabaseInstance(base.TroveDeleter): @@ -447,7 +446,7 @@ class CreateDatabaseInstance(command.ShowOne): access=access ) instance = set_attributes_for_print_detail(instance) - return zip(*sorted(six.iteritems(instance))) + return zip(*sorted(instance.items())) class ResetDatabaseInstanceStatus(command.Command): diff --git a/troveclient/osc/v1/database_logs.py b/troveclient/osc/v1/database_logs.py index 1cedd36..a7a1730 100644 --- a/troveclient/osc/v1/database_logs.py +++ b/troveclient/osc/v1/database_logs.py @@ -12,7 +12,6 @@ from osc_lib.command import command from osc_lib import utils as osc_utils -import six from troveclient import exceptions from troveclient.i18n import _ @@ -99,7 +98,7 @@ class SetDatabaseInstanceLog(command.ShowOne): ) result = log_info._info - return zip(*sorted(six.iteritems(result))) + return zip(*sorted(result.items())) class ShowDatabaseInstanceLog(command.ShowOne): @@ -132,7 +131,7 @@ class ShowDatabaseInstanceLog(command.ShowOne): log_info = db_instances.log_show(instance, parsed_args.log_name) result = log_info._info - return zip(*sorted(six.iteritems(result))) + return zip(*sorted(result.items())) class ShowDatabaseInstanceLogContents(command.Command): diff --git a/troveclient/osc/v1/database_quota.py b/troveclient/osc/v1/database_quota.py index f257dd7..82e77fc 100644 --- a/troveclient/osc/v1/database_quota.py +++ b/troveclient/osc/v1/database_quota.py @@ -14,7 +14,6 @@ from osc_lib.command import command from osc_lib import utils as osc_utils -import six from troveclient.i18n import _ @@ -71,4 +70,4 @@ class UpdateDatabaseQuota(command.ShowOne): } updated_quota = db_quota.update(parsed_args.tenant_id, update_params) - return zip(*sorted(six.iteritems(updated_quota))) + return zip(*sorted(updated_quota.items())) diff --git a/troveclient/osc/v1/database_root.py b/troveclient/osc/v1/database_root.py index cd6c533..c0c375d 100644 --- a/troveclient/osc/v1/database_root.py +++ b/troveclient/osc/v1/database_root.py @@ -15,7 +15,6 @@ from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils as osc_utils -import six from troveclient.i18n import _ @@ -80,7 +79,7 @@ class EnableDatabaseRoot(command.ShowOne): result = {'name': root[0], 'password': root[1]} - return zip(*sorted(six.iteritems(result))) + return zip(*sorted(result.items())) class DisableDatabaseRoot(command.Command): @@ -136,4 +135,4 @@ class ShowDatabaseRoot(command.ShowOne): root = db_root.is_cluster_root_enabled(instance_or_cluster) result = {'is_root_enabled': root.rootEnabled} - return zip(*sorted(six.iteritems(result))) + return zip(*sorted(result.items())) diff --git a/troveclient/osc/v1/database_users.py b/troveclient/osc/v1/database_users.py index edfc275..1048356 100644 --- a/troveclient/osc/v1/database_users.py +++ b/troveclient/osc/v1/database_users.py @@ -15,7 +15,6 @@ from osc_lib.command import command from osc_lib import exceptions from osc_lib import utils -import six from troveclient.i18n import _ @@ -129,7 +128,7 @@ class ShowDatabaseUser(command.ShowOne): parsed_args.instance) user = db_users.get(instance, parsed_args.name, hostname=parsed_args.host) - return zip(*sorted(six.iteritems(user._info))) + return zip(*sorted(user._info.items())) class DeleteDatabaseUser(command.Command): diff --git a/troveclient/osc/v1/datastores.py b/troveclient/osc/v1/datastores.py index 20b23c8..a45be92 100644 --- a/troveclient/osc/v1/datastores.py +++ b/troveclient/osc/v1/datastores.py @@ -14,7 +14,6 @@ from osc_lib.command import command from osc_lib import utils -import six from troveclient import exceptions from troveclient.i18n import _ @@ -65,7 +64,7 @@ class ShowDatastore(command.ShowOne): datastore = utils.find_resource(datastore_client, parsed_args.datastore) datastore = set_attributes_for_print_detail(datastore) - return zip(*sorted(six.iteritems(datastore))) + return zip(*sorted(datastore.items())) class DeleteDatastore(command.Command): @@ -146,7 +145,7 @@ class ShowDatastoreVersion(command.ShowOne): ' datastore version by name.')) if datastore_version._info.get('links'): del (datastore_version._info['links']) - return zip(*sorted(six.iteritems(datastore_version._info))) + return zip(*sorted(datastore_version._info.items())) class DeleteDatastoreVersion(command.Command): |