apps: switch import of ADMIN_PREFIX from routing into base app.

- routing is deprecated and will be soon removed
This commit is contained in:
Marcin Kuzminski 2017-11-07 14:17:26 +01:00
parent 4336119cb0
commit 116099638b
10 changed files with 11 additions and 11 deletions

View file

@ -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

View file

@ -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

View file

@ -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):

View file

@ -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.lib.utils2 import AttributeDict
from rhodecode.model.settings import SettingsModel
from rhodecode.lib.utils2 import AttributeDict
from rhodecode.tests.utils import AssertResponse

View file

@ -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):

View file

@ -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

View file

@ -27,7 +27,7 @@ from pyramid.authentication import SessionAuthenticationPolicy
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

View file

@ -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')

View file

@ -41,7 +41,7 @@ from webhelpers.pylonslib.secure_form import authentication_token
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

View file

@ -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