Use six.iteritems() instead of dict.iteritems().

mediagoblin/tests/test_sql_migrations.py

@@ -16,6 +16,8 @@
 
 import copy
 
+import six
+
 from sqlalchemy import (
     Table, Column, MetaData, Index,
     Integer, Float, Unicode, UnicodeText, DateTime, Boolean,
@@ -190,7 +192,7 @@ def level_exits_new_table(db_conn):
 
     for level in result:
 
-        for exit_name, to_level in level['exits'].iteritems():
+        for exit_name, to_level in six.iteritems(level['exits']):
             # Insert the level exit
             db_conn.execute(
                 level_exits.insert().values(

mediagoblin/tests/tools.py

@@ -19,6 +19,7 @@ import os
 import pkg_resources
 import shutil
 
+import six
 
 from paste.deploy import loadapp
 from webtest import TestApp
@@ -142,7 +143,7 @@ def install_fixtures_simple(db, fixtures):
     """
     Very simply install fixtures in the database
     """
-    for collection_name, collection_fixtures in fixtures.iteritems():
+    for collection_name, collection_fixtures in six.iteritems(fixtures):
         collection = db[collection_name]
         for fixture in collection_fixtures:
             collection.insert(fixture)
@@ -162,7 +163,7 @@ def assert_db_meets_expected(db, expected):
              {'id': 'foo',
               'some_field': 'some_value'},]}
     """
-    for collection_name, collection_data in expected.iteritems():
+    for collection_name, collection_data in six.iteritems(expected):
         collection = db[collection_name]
         for expected_document in collection_data:
             document = collection.query.filter_by(id=expected_document['id']).first()