Use OSM tiles in Geolocation plugin #5466

[mediagoblin.git] / mediagoblin / mg_globals.py

diff --git a/mediagoblin/mg_globals.py b/mediagoblin/mg_globals.py
index e4b94bdc677ce457c07de51c6399b096aa45e275..7da316804ea2de42ace6b5479221ce8967b2e874 100644 (file)
--- a/mediagoblin/mg_globals.py
+++ b/mediagoblin/mg_globals.py
@@ -21,6 +21,7 @@ import gettext
 import pkg_resources
 import threading
 
+import six
 
 #############################
 # General mediagoblin globals
@@ -29,9 +30,6 @@ import threading
 # SQL database engine
 database = None
 
-# beaker's cache manager
-cache = None
-
 # should be the same as the 
 public_store = None
 queue_store = None
@@ -67,7 +65,7 @@ def setup_globals(**kwargs):
     """
     from mediagoblin import mg_globals
 
-    for key, value in kwargs.iteritems():
+    for key, value in six.iteritems(kwargs):
         if not hasattr(mg_globals, key):
             raise AssertionError("Global %s not known" % key)
         setattr(mg_globals, key, value)