aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/tools.py
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2014-05-26 19:50:38 +0300
committerBerker Peksag <berker.peksag@gmail.com>2014-05-26 19:50:38 +0300
commit386c9c7c55147b27c258edd5deee36594553493d (patch)
treed50b1554106a1f17a1f5402fdece81cc570bd873 /mediagoblin/tests/tools.py
parent7f342c72f64594775bac1bcce81b32ae9e18e6ac (diff)
downloadmediagoblin-386c9c7c55147b27c258edd5deee36594553493d.tar.lz
mediagoblin-386c9c7c55147b27c258edd5deee36594553493d.tar.xz
mediagoblin-386c9c7c55147b27c258edd5deee36594553493d.zip
Use six.iteritems() instead of dict.iteritems().
Diffstat (limited to 'mediagoblin/tests/tools.py')
-rw-r--r--mediagoblin/tests/tools.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/mediagoblin/tests/tools.py b/mediagoblin/tests/tools.py
index 060dfda9..b8e06e19 100644
--- a/mediagoblin/tests/tools.py
+++ b/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()