Merge "Begin Python 3 compatability"

1 files changed, 4 insertions, 3 deletions

diff --git a/openstackclient/compute/v2/agent.py b/openstackclient/compute/v2/agent.py
index aac69d8a..b79ebbe7 100644
--- a/openstackclient/compute/v2/agent.py
+++ b/openstackclient/compute/v2/agent.py
@@ -1,4 +1,4 @@
-#   Copyright 2013 OpenStack, LLC.
+#   Copyright 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 @@
 """Agent action implementations"""
 
 import logging
+import six
 
 from cliff import command
 from cliff import lister
@@ -70,7 +71,7 @@ class CreateAgent(show.ShowOne):
             parsed_args.hypervisor
         )
         agent = compute_client.agents.create(*args)._info.copy()
-        return zip(*sorted(agent.iteritems()))
+        return zip(*sorted(six.iteritems(agent)))
 
 
 class DeleteAgent(command.Command):
@@ -160,4 +161,4 @@ class SetAgent(show.ShowOne):
             parsed_args.md5hash
         )
         agent = compute_client.agents.update(*args)._info.copy()
-        return zip(*sorted(agent.iteritems()))
+        return zip(*sorted(six.iteritems(agent)))