Use Python3-compatible dict method names

Python 2 has keys()/values()/items(), which return lists,
iterkeys()/itervalues()/iteritems(), which return iterators,
and viewkeys()/viewvalues()/viewitems() which return views.

Python 3 has only keys()/values()/items(), which return views.
To get iterators, one can use iter() or a for loop/comprehension;
for lists there's the list() constructor.

When iterating through the entire dict, without modifying the dict,
 the difference between Python 2's items() and iteritems() is
negligible, especially on small dicts (the main overhead is
extra memory, not CPU time). In the interest of simpler code,
this patch changes many instances of iteritems() to items(),
iterkeys() to keys() etc.

In other cases, helpers like six.itervalues are used.

Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/ipatests/test_ipalib/test_backend.py b/ipatests/test_ipalib/test_backend.py
index 163c4f272..756d434e3 100644
--- a/ipatests/test_ipalib/test_backend.py
+++ b/ipatests/test_ipalib/test_backend.py
@@ -223,12 +223,12 @@ class test_Executioner(ClassChecker):
         # Test that CommandError is raised:
         conn = Connection('The connection.', Disconnect('someconn'))
         context.someconn = conn
-        print str(context.__dict__.keys())
+        print str(list(context.__dict__))
         e = raises(errors.CommandError, o.execute, 'nope')
         assert e.name == 'nope'
         assert conn.disconnect.called is True  # Make sure destroy_context() was called
-        print str(context.__dict__.keys())
-        assert context.__dict__.keys() == []
+        print str(list(context.__dict__))
+        assert list(context.__dict__) == []
 
         # Test with echo command:
         arg1 = unicode_str
@@ -247,7 +247,7 @@ class test_Executioner(ClassChecker):
             result=(arg1, arg2, options)
         )
         assert conn.disconnect.called is True  # Make sure destroy_context() was called
-        assert context.__dict__.keys() == []
+        assert list(context.__dict__) == []
 
         conn = Connection('The connection.', Disconnect('someconn'))
         context.someconn = conn
@@ -255,7 +255,7 @@ class test_Executioner(ClassChecker):
             result=(arg1, arg2, options)
         )
         assert conn.disconnect.called is True  # Make sure destroy_context() was called
-        assert context.__dict__.keys() == []
+        assert list(context.__dict__) == []
 
         # Test with good command:
         conn = Connection('The connection.', Disconnect('someconn'))
@@ -264,14 +264,14 @@ class test_Executioner(ClassChecker):
         assert e.name == 'nurse'
         assert e.error == u'Not naughty!'
         assert conn.disconnect.called is True  # Make sure destroy_context() was called
-        assert context.__dict__.keys() == []
+        assert list(context.__dict__) == []
 
         # Test with bad command:
         conn = Connection('The connection.', Disconnect('someconn'))
         context.someconn = conn
         e = raises(errors.InternalError, o.execute, 'bad')
         assert conn.disconnect.called is True  # Make sure destroy_context() was called
-        assert context.__dict__.keys() == []
+        assert list(context.__dict__) == []
 
         # Test with option 'name':
         conn = Connection('The connection.', Disconnect('someconn'))