summaryrefslogtreecommitdiff
path: root/openstackclient/identity/v2_0/user.py
diff options
context:
space:
mode:
Diffstat (limited to 'openstackclient/identity/v2_0/user.py')
-rw-r--r--openstackclient/identity/v2_0/user.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py
index 39be81af..8c8e2622 100644
--- a/openstackclient/identity/v2_0/user.py
+++ b/openstackclient/identity/v2_0/user.py
@@ -1,4 +1,4 @@
-# Copyright 2012-2013 OpenStack, LLC.
+# Copyright 2012-2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
@@ -16,6 +16,7 @@
"""Identity v2.0 User action implementations"""
import logging
+import six
import sys
from cliff import command
@@ -79,7 +80,7 @@ class CreateUser(show.ShowOne):
info = {}
info.update(user._info)
- return zip(*sorted(info.iteritems()))
+ return zip(*sorted(six.iteritems(info)))
class DeleteUser(command.Command):
@@ -219,4 +220,4 @@ class ShowUser(show.ShowOne):
info = {}
info.update(user._info)
- return zip(*sorted(info.iteritems()))
+ return zip(*sorted(six.iteritems(info)))