diff options
Diffstat (limited to 'mediagoblin/mg_globals.py')
-rw-r--r-- | mediagoblin/mg_globals.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mediagoblin/mg_globals.py b/mediagoblin/mg_globals.py index 26ed66fa..7da31680 100644 --- 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 @@ -64,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) |