diff --git a/rhodecode/config/environment.py b/rhodecode/config/environment.py --- a/rhodecode/config/environment.py +++ b/rhodecode/config/environment.py @@ -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__) diff --git a/rhodecode/lib/celerylib/__init__.py b/rhodecode/lib/celerylib/__init__.py --- a/rhodecode/lib/celerylib/__init__.py +++ b/rhodecode/lib/celerylib/__init__.py @@ -40,7 +40,6 @@ from rhodecode.lib.pidlock import Daemon from celery.messaging import establish_connection from pylons import config -from rhodecode.lib import celerypylons log = logging.getLogger(__name__)