diff options
author | Nathan Yergler <nathan@yergler.net> | 2011-10-01 15:10:41 -0700 |
---|---|---|
committer | Nathan Yergler <nathan@yergler.net> | 2011-10-01 15:10:41 -0700 |
commit | 285ffeddf3542201b83072d3be544c85e9c487c2 (patch) | |
tree | 85f4f4b3eda299bb0bb1445c45e30ffea17bf15e /mediagoblin/init/celery | |
parent | 243c3843bd574129caa7663e25d1a843b2d2dd30 (diff) | |
download | mediagoblin-285ffeddf3542201b83072d3be544c85e9c487c2.tar.lz mediagoblin-285ffeddf3542201b83072d3be544c85e9c487c2.tar.xz mediagoblin-285ffeddf3542201b83072d3be544c85e9c487c2.zip |
has_key is deprecated, converting uses to use "in" operator.
Diffstat (limited to 'mediagoblin/init/celery')
-rw-r--r-- | mediagoblin/init/celery/__init__.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mediagoblin/init/celery/__init__.py b/mediagoblin/init/celery/__init__.py index 21ce1d39..f7ef9f39 100644 --- a/mediagoblin/init/celery/__init__.py +++ b/mediagoblin/init/celery/__init__.py @@ -40,25 +40,25 @@ def setup_celery_from_config(app_config, global_config, - set_environ: if set, this will CELERY_CONFIG_MODULE to the settings_module """ - if global_config.has_key('celery'): + if 'celery' in global_config: celery_conf = global_config['celery'] else: celery_conf = {} - + celery_settings = {} # set up mongodb stuff celery_settings['CELERY_RESULT_BACKEND'] = 'mongodb' - if not celery_settings.has_key('BROKER_BACKEND'): + if 'BROKER_BACKEND' not in celery_settings: celery_settings['BROKER_BACKEND'] = 'mongodb' celery_mongo_settings = {} - if app_config.has_key('db_host'): + if 'db_host' in app_config: celery_mongo_settings['host'] = app_config['db_host'] if celery_settings['BROKER_BACKEND'] == 'mongodb': celery_settings['BROKER_HOST'] = app_config['db_host'] - if app_config.has_key('db_port'): + if 'db_port' in app_config: celery_mongo_settings['port'] = app_config['db_port'] if celery_settings['BROKER_BACKEND'] == 'mongodb': celery_settings['BROKER_PORT'] = app_config['db_port'] |