[py3k] use dict.items() / dict.values() instead of .iter*

4 files changed, 9 insertions, 9 deletions

diff --git a/graph.py b/graph.py
index 686a6ce..cef1c98 100644
--- a/graph.py
+++ b/graph.py
@@ -64,7 +64,7 @@ class DotBackend:
             assert charset.lower() in ('utf-8', 'iso-8859-1', 'latin1'), \
                    'unsupported charset %s' % charset
             self.emit('charset="%s"' % charset)
-        for param in sorted(additionnal_param.iteritems()):
+        for param in sorted(additionnal_param.items()):
             self.emit('='.join(param))
 
     def get_source(self):
diff --git a/registry.py b/registry.py
index 084bb4d..a52b2eb 100644
--- a/registry.py
+++ b/registry.py
@@ -269,7 +269,7 @@ class Registry(dict):
     def initialization_completed(self):
         """call method __registered__() on registered objects when the callback
         is defined"""
-        for objects in self.itervalues():
+        for objects in self.values():
             for objectcls in objects:
                 registered = getattr(objectcls, '__registered__', None)
                 if registered:
@@ -374,7 +374,7 @@ class Registry(dict):
         """return an iterator on possible objects in this registry for the given
         context
         """
-        for objects in self.itervalues():
+        for objects in self.values():
             obj = self._select_best(objects,  *args, **kwargs)
             if obj is None:
                 continue
@@ -550,7 +550,7 @@ class RegistryStore(dict):
     def reset(self):
         """clear all registries managed by this store"""
         # don't use self.clear, we want to keep existing subdictionaries
-        for subdict in self.itervalues():
+        for subdict in self.values():
             subdict.clear()
         self._lastmodifs = {}
 
@@ -677,7 +677,7 @@ class RegistryStore(dict):
 
     def initialization_completed(self):
         """call initialization_completed() on all known registries"""
-        for reg in self.itervalues():
+        for reg in self.values():
             reg.initialization_completed()
 
     def _mdate(self, filepath):
@@ -755,7 +755,7 @@ class RegistryStore(dict):
         if hasattr(module, 'registration_callback'):
             module.registration_callback(self)
         else:
-            self.register_all(vars(module).itervalues(), module.__name__)
+            self.register_all(vars(module).values(), module.__name__)
 
     def _load_ancestors_then_object(self, modname, objectcls, butclasses=()):
         """handle class registration according to rules defined in
@@ -929,7 +929,7 @@ def objectify_predicate(selector_func):
 _PREDICATES = {}
 
 def wrap_predicates(decorator):
-    for predicate in _PREDICATES.itervalues():
+    for predicate in _PREDICATES.values():
         if not '_decorators' in predicate.__dict__:
             predicate._decorators = set()
         if decorator in predicate._decorators:
diff --git a/tasksqueue.py b/tasksqueue.py
index 801296a..ed74cf5 100644
--- a/tasksqueue.py
+++ b/tasksqueue.py
@@ -32,7 +32,7 @@ PRIORITY = {
     'MEDIUM': MEDIUM,
     'HIGH': HIGH,
     }
-REVERSE_PRIORITY = dict((values, key) for key, values in PRIORITY.iteritems())
+REVERSE_PRIORITY = dict((values, key) for key, values in PRIORITY.items())
 
 
 
diff --git a/testlib.py b/testlib.py
index fc86298..22c58bb 100644
--- a/testlib.py
+++ b/testlib.py
@@ -1051,7 +1051,7 @@ class TestCase(unittest.TestCase):
 
 
                 msgs = [ "%s: %s"% (name, items)
-                    for name, items in errors.iteritems() if items]
+                    for name, items in errors.items() if items]
 
                 if msgs:
                     msgs.insert(0, "%s and %s differ :" % (