Changed celery config keys to upper case and removed upper casing of keys when initialising the config as per issue #214

1 files changed, 1 insertions, 56 deletions

diff --git a/mediagoblin/init/celery/__init__.py b/mediagoblin/init/celery/__init__.py
index 6dcea239..88dedd28 100644
--- a/mediagoblin/init/celery/__init__.py
+++ b/mediagoblin/init/celery/__init__.py
@@ -14,59 +14,4 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import os
-import sys
-
-
-MANDATORY_CELERY_IMPORTS = ['mediagoblin.processing']
-
-DEFAULT_SETTINGS_MODULE = 'mediagoblin.init.celery.dummy_settings_module'
-
-
-def setup_celery_from_config(app_config, global_config,
-                             settings_module=DEFAULT_SETTINGS_MODULE,
-                             force_celery_always_eager=False,
-                             set_environ=True):
-    """
-    Take a mediagoblin app config and try to set up a celery settings
-    module from this.
-
-    Args:
-    - app_config: the application config section
-    - global_config: the entire ConfigObj loaded config, all sections
-    - settings_module: the module to populate, as a string
-    - force_celery_always_eager: whether or not to force celery into
-      always eager mode; good for development and small installs
-    - set_environ: if set, this will CELERY_CONFIG_MODULE to the
-      settings_module
-    """
-    if 'celery' in global_config:
-        celery_conf = global_config['celery']
-    else:
-        celery_conf = {}
-
-    celery_settings = {}
-
-    # Add all celery settings from config
-    for key, value in celery_conf.iteritems():
-        key = key.upper()
-        celery_settings[key] = value
-
-    # TODO: use default result stuff here if it exists
-
-    # add mandatory celery imports
-    celery_imports = celery_settings.setdefault('CELERY_IMPORTS', [])
-    celery_imports.extend(MANDATORY_CELERY_IMPORTS)
-
-    if force_celery_always_eager:
-        celery_settings['CELERY_ALWAYS_EAGER'] = True
-        celery_settings['CELERY_EAGER_PROPAGATES_EXCEPTIONS'] = True
-
-    __import__(settings_module)
-    this_module = sys.modules[settings_module]
-
-    for key, value in celery_settings.iteritems():
-        setattr(this_module, key, value)
-
-    if set_environ:
-        os.environ['CELERY_CONFIG_MODULE'] = settings_module
+from mediagoblin._version import __version__