Merge pull request !2708 from rhodecode-enterprise-ce feature/mako-lookup-upgrade
Introduce removed usage of global.
This commit is contained in:
commit
0412f51db0
1 changed files with 5 additions and 7 deletions
|
|
@ -27,7 +27,6 @@ from pyramid.asset import resolve_asset_spec
|
|||
from pyramid.renderers import get_renderer
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
TEMPLATES_PATH = ""
|
||||
|
||||
|
||||
def get_partial_renderer(request, tmpl_name):
|
||||
|
|
@ -47,6 +46,7 @@ class PyramidPartialRenderer(object):
|
|||
"""
|
||||
|
||||
def __init__(self, request, tmpl_name):
|
||||
self.tmpl_path = ""
|
||||
self.tmpl_name = tmpl_name
|
||||
self.request = request
|
||||
|
||||
|
|
@ -57,14 +57,12 @@ class PyramidPartialRenderer(object):
|
|||
# TODO: this is a workaround for exception happening with auto-merge enabled, to be replaced with proper fix
|
||||
from mako.lookup import TemplateLookup
|
||||
|
||||
global TEMPLATES_PATH
|
||||
|
||||
if not TEMPLATES_PATH:
|
||||
if not self.tmpl_path:
|
||||
package, filename = resolve_asset_spec(self.tmpl_name)
|
||||
template_path = os.path.dirname(resource_filename(package, filename))
|
||||
TEMPLATES_PATH = Path(template_path).as_posix()
|
||||
log.debug(f"Using {TEMPLATES_PATH} path")
|
||||
_tmpl_lookup = TemplateLookup([TEMPLATES_PATH])
|
||||
self.tmpl_path = Path(template_path).as_posix()
|
||||
log.debug(f"Using {self.tmpl_path} path")
|
||||
_tmpl_lookup = TemplateLookup([self.tmpl_path])
|
||||
self.tmpl_name = Path(self.tmpl_name).name
|
||||
return _tmpl_lookup.get_template(self.tmpl_name)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue