heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'merge-python3-port'

Browse Source 
Conflicts:
	setup.py
This commit is contained in:
Christopher Allan Webber
2014-09-22 13:58:13 -05:00
parent c47f402d7e 6430ae97ec
commit a6252cbf21
100 changed files with 945 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mediagoblin/init/celery/__init__.py
View File

@@ -19,6 +19,8 @@ import sys
import datetime
import logging
import six
from celery import Celery
from mediagoblin.tools.pluginapi import hook_runall
@@ -48,7 +50,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
@@ -113,7 +115,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: