# HG changeset patch # User Marcin Kuzminski # Date 2017-11-07 13:17:26 # Node ID 4e0e53bc3a3bdc0e9f2b9dc3876ab6868ce04f77 # Parent 323842c22d97cf1fdc197a3ae906912c0d10b2b0 apps: switch import of ADMIN_PREFIX from routing into base app. - routing is deprecated and will be soon removed diff --git a/rhodecode/apps/admin/__init__.py b/rhodecode/apps/admin/__init__.py --- a/rhodecode/apps/admin/__init__.py +++ b/rhodecode/apps/admin/__init__.py @@ -20,7 +20,7 @@ from rhodecode.apps.admin.navigation import NavigationRegistry -from rhodecode.config.routing import ADMIN_PREFIX +from rhodecode.apps._base import ADMIN_PREFIX from rhodecode.lib.utils2 import str2bool diff --git a/rhodecode/apps/channelstream/__init__.py b/rhodecode/apps/channelstream/__init__.py --- a/rhodecode/apps/channelstream/__init__.py +++ b/rhodecode/apps/channelstream/__init__.py @@ -23,7 +23,7 @@ import os from pyramid.events import ApplicationCreated from pyramid.settings import asbool -from rhodecode.config.routing import ADMIN_PREFIX +from rhodecode.apps._base import ADMIN_PREFIX from rhodecode.lib.ext_json import json diff --git a/rhodecode/apps/login/__init__.py b/rhodecode/apps/login/__init__.py --- a/rhodecode/apps/login/__init__.py +++ b/rhodecode/apps/login/__init__.py @@ -19,7 +19,7 @@ # and proprietary license terms, please see https://rhodecode.com/licenses/ -from rhodecode.config.routing import ADMIN_PREFIX +from rhodecode.apps._base import ADMIN_PREFIX def includeme(config): diff --git a/rhodecode/apps/login/tests/test_register_captcha.py b/rhodecode/apps/login/tests/test_register_captcha.py --- a/rhodecode/apps/login/tests/test_register_captcha.py +++ b/rhodecode/apps/login/tests/test_register_captcha.py @@ -22,10 +22,10 @@ import mock import pytest +from rhodecode.apps._base import ADMIN_PREFIX from rhodecode.apps.login.views import LoginView, CaptchaData -from rhodecode.config.routing import ADMIN_PREFIX +from rhodecode.model.settings import SettingsModel from rhodecode.lib.utils2 import AttributeDict -from rhodecode.model.settings import SettingsModel from rhodecode.tests.utils import AssertResponse diff --git a/rhodecode/apps/ops/__init__.py b/rhodecode/apps/ops/__init__.py --- a/rhodecode/apps/ops/__init__.py +++ b/rhodecode/apps/ops/__init__.py @@ -18,7 +18,7 @@ # RhodeCode Enterprise Edition, including its added features, Support services, # and proprietary license terms, please see https://rhodecode.com/licenses/ -from rhodecode.config.routing import ADMIN_PREFIX +from rhodecode.apps._base import ADMIN_PREFIX def admin_routes(config): diff --git a/rhodecode/apps/user_group/__init__.py b/rhodecode/apps/user_group/__init__.py --- a/rhodecode/apps/user_group/__init__.py +++ b/rhodecode/apps/user_group/__init__.py @@ -20,7 +20,7 @@ from rhodecode.apps.admin.navigation import NavigationRegistry -from rhodecode.config.routing import ADMIN_PREFIX +from rhodecode.apps._base import ADMIN_PREFIX from rhodecode.lib.utils2 import str2bool diff --git a/rhodecode/authentication/__init__.py b/rhodecode/authentication/__init__.py --- a/rhodecode/authentication/__init__.py +++ b/rhodecode/authentication/__init__.py @@ -27,7 +27,7 @@ from pyramid.authentication import Sessi from rhodecode.authentication.registry import AuthenticationPluginRegistry from rhodecode.authentication.routes import root_factory from rhodecode.authentication.routes import AuthnRootResource -from rhodecode.config.routing import ADMIN_PREFIX +from rhodecode.apps._base import ADMIN_PREFIX from rhodecode.model.settings import SettingsModel diff --git a/rhodecode/authentication/tests/functional/test_settings.py b/rhodecode/authentication/tests/functional/test_settings.py --- a/rhodecode/authentication/tests/functional/test_settings.py +++ b/rhodecode/authentication/tests/functional/test_settings.py @@ -23,7 +23,7 @@ import pytest from rhodecode.authentication.tests.conftest import ( EnabledAuthPlugin, DisabledAuthPlugin) -from rhodecode.config.routing import ADMIN_PREFIX +from rhodecode.apps._base import ADMIN_PREFIX @pytest.mark.usefixtures('autologin_user', 'app') diff --git a/rhodecode/model/validators.py b/rhodecode/model/validators.py --- a/rhodecode/model/validators.py +++ b/rhodecode/model/validators.py @@ -41,7 +41,7 @@ from webhelpers.pylonslib.secure_form im from rhodecode.authentication import ( legacy_plugin_prefix, _import_legacy_plugin) from rhodecode.authentication.base import loadplugin -from rhodecode.config.routing import ADMIN_PREFIX +from rhodecode.apps._base import ADMIN_PREFIX from rhodecode.lib.auth import HasRepoGroupPermissionAny, HasPermissionAny from rhodecode.lib.utils import repo_name_slug, make_db_config from rhodecode.lib.utils2 import safe_int, str2bool, aslist, md5, safe_unicode diff --git a/rhodecode/tests/functional/test_admin_settings.py b/rhodecode/tests/functional/test_admin_settings.py --- a/rhodecode/tests/functional/test_admin_settings.py +++ b/rhodecode/tests/functional/test_admin_settings.py @@ -22,7 +22,7 @@ import mock import pytest import rhodecode -from rhodecode.config.routing import ADMIN_PREFIX +from rhodecode.apps._base import ADMIN_PREFIX from rhodecode.lib.utils2 import md5 from rhodecode.model.db import RhodeCodeUi from rhodecode.model.meta import Session