heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

celery_setup: drop param to setup_self and simplify OUR_MODULENAME

Browse Source 
setup_self used to look like this:
	setup_self(setup_globals_func=setup_globals)
The function isn't called with any param, so drop it.
Rewrite function as needed.

The module var OUR_MODULENAME just has the module's name in
it. This is available as __name__ anyway, so use this to
initialize the var.
This commit is contained in:
Elrond 2011-06-10 21:20:18 +02:00
parent d07713d0b0
commit e893094a06
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mediagoblin/celery_setup/from_celery.py
View File

@ -23,13 +23,12 @@ from mediagoblin import storage
from mediagoblin.db.open import setup_connection_and_db_from_config from mediagoblin.db.open import setup_connection_and_db_from_config
from mediagoblin.celery_setup import setup_celery_from_config from mediagoblin.celery_setup import setup_celery_from_config
from mediagoblin.globals import setup_globals from mediagoblin.globals import setup_globals
from mediagoblin import globals as mgoblin_globals
OUR_MODULENAME = 'mediagoblin.celery_setup.from_celery' OUR_MODULENAME = __name__
def setup_self(setup_globals_func=setup_globals): def setup_self():
""" """
Transform this module into a celery config module by reading the Transform this module into a celery config module by reading the
mediagoblin config file. Set the environment variable mediagoblin config file. Set the environment variable
@ -76,7 +75,7 @@ def setup_self(setup_globals_func=setup_globals):
queue_store = storage.storage_system_from_paste_config( queue_store = storage.storage_system_from_paste_config(
mgoblin_section, 'queuestore') mgoblin_section, 'queuestore')
setup_globals_func( setup_globals(
db_connection=connection, db_connection=connection,
database=db, database=db,
public_store=public_store, public_store=public_store,

5
mediagoblin/celery_setup/from_tests.py
View File

@ -19,13 +19,12 @@ import os
from mediagoblin.tests.tools import TEST_APP_CONFIG from mediagoblin.tests.tools import TEST_APP_CONFIG
from mediagoblin import util from mediagoblin import util
from mediagoblin.celery_setup import setup_celery_from_config from mediagoblin.celery_setup import setup_celery_from_config
from mediagoblin.globals import setup_globals
OUR_MODULENAME = 'mediagoblin.celery_setup.from_tests' OUR_MODULENAME = __name__
def setup_self(setup_globals_func=setup_globals): def setup_self():
""" """
Set up celery for testing's sake, which just needs to set up Set up celery for testing's sake, which just needs to set up
celery and celery only. celery and celery only.