# HG changeset patch # User Marcin Kuzminski # Date 2017-07-08 13:23:40 # Node ID 002c3bcfa273b75bceb6c36538a2117f61ea4f11 # Parent 43ece55ebe613f6a9504d86e3bbc79e8bb3aa054 core: make pylons global be used in obsolete parts of the code. - will help later cleanup of pylons specific code diff --git a/rhodecode/apps/_base/__init__.py b/rhodecode/apps/_base/__init__.py --- a/rhodecode/apps/_base/__init__.py +++ b/rhodecode/apps/_base/__init__.py @@ -20,7 +20,7 @@ import time import logging -from pylons import tmpl_context as c + from pyramid.httpexceptions import HTTPFound from rhodecode.lib import helpers as h @@ -120,6 +120,7 @@ class BaseAppView(object): Registers attributes to pylons global `c` """ # TODO(marcink): remove once pyramid migration is finished + from pylons import tmpl_context as c for k, v in tmpl_args.items(): setattr(c, k, v) diff --git a/rhodecode/apps/admin/navigation.py b/rhodecode/apps/admin/navigation.py --- a/rhodecode/apps/admin/navigation.py +++ b/rhodecode/apps/admin/navigation.py @@ -22,7 +22,6 @@ import logging import collections -from pylons import url from zope.interface import implementer from rhodecode.apps.admin.interfaces import IAdminNavigationRegistry @@ -64,6 +63,7 @@ class NavEntry(object): pyramid_request = get_current_request() return pyramid_request.route_path(self.view_name) else: + from pylons import url return url(self.view_name) def get_localized_name(self, request):