summaryrefslogtreecommitdiff
path: root/openstackclient/object
diff options
context:
space:
mode:
Diffstat (limited to 'openstackclient/object')
-rw-r--r--openstackclient/object/v1/account.py3
-rw-r--r--openstackclient/object/v1/container.py3
-rw-r--r--openstackclient/object/v1/object.py3
3 files changed, 3 insertions, 6 deletions
diff --git a/openstackclient/object/v1/account.py b/openstackclient/object/v1/account.py
index 95be8132..d6bc9fd7 100644
--- a/openstackclient/object/v1/account.py
+++ b/openstackclient/object/v1/account.py
@@ -16,7 +16,6 @@
from osc_lib.cli import format_columns
from osc_lib.cli import parseractions
from osc_lib.command import command
-import six
from openstackclient.i18n import _
@@ -50,7 +49,7 @@ class ShowAccount(command.ShowOne):
if 'properties' in data:
data['properties'] = format_columns.DictColumn(
data.pop('properties'))
- return zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class UnsetAccount(command.Command):
diff --git a/openstackclient/object/v1/container.py b/openstackclient/object/v1/container.py
index 02e8d277..47ca5bc1 100644
--- a/openstackclient/object/v1/container.py
+++ b/openstackclient/object/v1/container.py
@@ -21,7 +21,6 @@ from osc_lib.cli import format_columns
from osc_lib.cli import parseractions
from osc_lib.command import command
from osc_lib import utils
-import six
from openstackclient.i18n import _
@@ -233,7 +232,7 @@ class ShowContainer(command.ShowOne):
if 'properties' in data:
data['properties'] = format_columns.DictColumn(data['properties'])
- return zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class UnsetContainer(command.Command):
diff --git a/openstackclient/object/v1/object.py b/openstackclient/object/v1/object.py
index 3747e19e..01e537ee 100644
--- a/openstackclient/object/v1/object.py
+++ b/openstackclient/object/v1/object.py
@@ -22,7 +22,6 @@ from osc_lib.cli import parseractions
from osc_lib.command import command
from osc_lib import exceptions
from osc_lib import utils
-import six
from openstackclient.i18n import _
@@ -287,7 +286,7 @@ class ShowObject(command.ShowOne):
if 'properties' in data:
data['properties'] = format_columns.DictColumn(data['properties'])
- return zip(*sorted(six.iteritems(data)))
+ return zip(*sorted(data.items()))
class UnsetObject(command.Command):