Cleanup mediagoblin._compat and fix translation tests.

1 files changed, 3 insertions, 2 deletions

diff --git a/mediagoblin/db/open.py b/mediagoblin/db/open.py
index 9cf9e578..34f0bffa 100644
--- a/mediagoblin/db/open.py
+++ b/mediagoblin/db/open.py
@@ -18,9 +18,10 @@
 from sqlalchemy import create_engine, event
 import logging
 
+import six
+
 from mediagoblin.db.base import Base, Session
 from mediagoblin import mg_globals
-from mediagoblin._compat import iteritems
 
 _log = logging.getLogger(__name__)
 
@@ -29,7 +30,7 @@ class DatabaseMaster(object):
     def __init__(self, engine):
         self.engine = engine
 
-        for k, v in iteritems(Base._decl_class_registry):
+        for k, v in six.iteritems(Base._decl_class_registry):
             setattr(self, k, v)
 
     def commit(self):