diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2014-05-26 19:50:38 +0300 |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2014-05-26 19:50:38 +0300 |
| commit | 386c9c7c55147b27c258edd5deee36594553493d (patch) | |
| tree | d50b1554106a1f17a1f5402fdece81cc570bd873 /mediagoblin/init | |
| parent | 7f342c72f64594775bac1bcce81b32ae9e18e6ac (diff) | |
| download | mediagoblin-386c9c7c55147b27c258edd5deee36594553493d.tar.lz mediagoblin-386c9c7c55147b27c258edd5deee36594553493d.tar.xz mediagoblin-386c9c7c55147b27c258edd5deee36594553493d.zip | |
Use six.iteritems() instead of dict.iteritems().
Diffstat (limited to 'mediagoblin/init')
| -rw-r--r-- | mediagoblin/init/celery/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mediagoblin/init/celery/__init__.py b/mediagoblin/init/celery/__init__.py index 57242bf6..ffc7ca0e 100644 --- a/mediagoblin/init/celery/__init__.py +++ b/mediagoblin/init/celery/__init__.py @@ -18,6 +18,8 @@ import os import sys import logging +import six + from celery import Celery from mediagoblin.tools.pluginapi import hook_runall @@ -45,7 +47,7 @@ def get_celery_settings_dict(app_config, global_config, celery_settings = {} # Add all celery settings from config - for key, value in celery_conf.iteritems(): + for key, value in six.iteritems(celery_conf): celery_settings[key] = value # TODO: use default result stuff here if it exists @@ -98,7 +100,7 @@ def setup_celery_from_config(app_config, global_config, __import__(settings_module) this_module = sys.modules[settings_module] - for key, value in celery_settings.iteritems(): + for key, value in six.iteritems(celery_settings): setattr(this_module, key, value) if set_environ: |