Merge "Python 3: use six.iteritems()"2.3.6

3 files changed, 9 insertions, 6 deletions

diff --git a/neutronclient/tests/unit/test_cli20.py b/neutronclient/tests/unit/test_cli20.py
index daad6a0..9fd2d38 100644
--- a/neutronclient/tests/unit/test_cli20.py
+++ b/neutronclient/tests/unit/test_cli20.py
@@ -14,15 +14,16 @@
 #    under the License.
 #
 
-import urllib
-
 import contextlib
 import cStringIO
+import sys
+import urllib
+
 import fixtures
 from mox3 import mox
 from oslotest import base
 import requests
-import sys
+import six
 
 from neutronclient.common import constants
 from neutronclient.common import exceptions
@@ -112,7 +113,7 @@ class MyComparator(mox.Comparator):
     def _com_dict(self, lhs, rhs):
         if len(lhs) != len(rhs):
             return False
-        for key, value in lhs.iteritems():
+        for key, value in six.iteritems(lhs):
             if key not in rhs:
                 return False
             rhs_value = rhs[key]
diff --git a/neutronclient/tests/unit/test_cli20_nsx_networkgateway.py b/neutronclient/tests/unit/test_cli20_nsx_networkgateway.py
index 8a52a28..0d77d4d 100644
--- a/neutronclient/tests/unit/test_cli20_nsx_networkgateway.py
+++ b/neutronclient/tests/unit/test_cli20_nsx_networkgateway.py
@@ -17,6 +17,7 @@
 import sys
 
 from mox3 import mox
+import six
 
 from neutronclient.neutron.v2_0.nsx import networkgateway as nwgw
 from neutronclient.tests.unit import test_cli20
@@ -131,7 +132,7 @@ class CLITestV20NetworkGatewayJSON(test_cli20.CLITestV20Base):
         position_names = ['name', ]
         position_values = [name, ]
         args = []
-        for (k, v) in extra_body.iteritems():
+        for (k, v) in six.iteritems(extra_body):
             if (k == 'client_certificate' and client_certificate_file):
                 v = client_certificate_file
                 k = 'client_certificate_file'
diff --git a/neutronclient/tests/unit/test_utils.py b/neutronclient/tests/unit/test_utils.py
index 4ccce64..44c0870 100644
--- a/neutronclient/tests/unit/test_utils.py
+++ b/neutronclient/tests/unit/test_utils.py
@@ -16,6 +16,7 @@
 import datetime
 import sys
 
+import six
 import testtools
 
 from neutronclient.common import exceptions
@@ -162,7 +163,7 @@ class ToPrimitiveTestCase(testtools.TestCase):
 
         class IterItemsClass(object):
             def iteritems(self):
-                return d.iteritems()
+                return six.iteritems(d)
 
         x = IterItemsClass()
         p = utils.to_primitive(x)