diff options
Diffstat (limited to 'mediagoblin/init/celery/__init__.py')
| -rw-r--r-- | mediagoblin/init/celery/__init__.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mediagoblin/init/celery/__init__.py b/mediagoblin/init/celery/__init__.py index 9fb783bd..26f7cb61 100644 --- a/mediagoblin/init/celery/__init__.py +++ b/mediagoblin/init/celery/__init__.py @@ -58,7 +58,7 @@ def get_celery_settings_dict(app_config, global_config, celery_settings = {} # Add all celery settings from config - for key, value in six.iteritems(celery_conf): + for key, value in celery_conf.items(): celery_settings[key] = value # TODO: use default result stuff here if it exists @@ -122,7 +122,7 @@ def setup_celery_from_config(app_config, global_config, __import__(settings_module) this_module = sys.modules[settings_module] - for key, value in six.iteritems(celery_settings): + for key, value in celery_settings.items(): setattr(this_module, key, value) if set_environ: @@ -132,8 +132,8 @@ def setup_celery_from_config(app_config, global_config, # initiated from celery import current_app - _log.info('Setting celery configuration from object "{0}"'.format( + _log.info('Setting celery configuration from object "{}"'.format( settings_module)) current_app.config_from_object(this_module) - _log.debug('Celery broker host: {0}'.format(current_app.conf['BROKER_HOST'])) + _log.debug('Celery broker host: {}'.format(current_app.conf['BROKER_HOST'])) |