Mercurial > kallithea
changeset 1006:02246101c846 beta
moved out celerypylons import to enviromnet to prevent celery from displaying celeryconfig.py warning
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Tue, 08 Feb 2011 20:41:59 +0100 |
| parents | 520e67cbb494 |
| children | 6faef09309e0 |
| files | rhodecode/config/environment.py rhodecode/lib/celerylib/__init__.py |
| diffstat | 2 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/config/environment.py Tue Feb 08 15:41:47 2011 +0100 +++ b/rhodecode/config/environment.py Tue Feb 08 20:41:59 2011 +0100 @@ -1,17 +1,22 @@ """Pylons environment configuration""" + +import os +import logging + from mako.lookup import TemplateLookup from pylons.configuration import PylonsConfig from pylons.error import handle_mako_error + +import rhodecode.lib.app_globals as app_globals +import rhodecode.lib.helpers + from rhodecode.config.routing import make_map +from rhodecode.lib import celerypylons from rhodecode.lib.auth import set_available_permissions, set_base_path from rhodecode.lib.utils import repo2db_mapper, make_ui, set_rhodecode_config from rhodecode.model import init_model from rhodecode.model.scm import ScmModel from sqlalchemy import engine_from_config -import logging -import os -import rhodecode.lib.app_globals as app_globals -import rhodecode.lib.helpers log = logging.getLogger(__name__)
--- a/rhodecode/lib/celerylib/__init__.py Tue Feb 08 15:41:47 2011 +0100 +++ b/rhodecode/lib/celerylib/__init__.py Tue Feb 08 20:41:59 2011 +0100 @@ -40,7 +40,6 @@ from celery.messaging import establish_connection from pylons import config -from rhodecode.lib import celerypylons log = logging.getLogger(__name__)