Merge branch 'master' into develop
(I merged #726 into master by accident)
This commit is contained in:
@@ -73,13 +73,10 @@ class CompressorConf(AppConf):
|
|||||||
|
|
||||||
# Returns the Jinja2 environment to use in offline compression.
|
# Returns the Jinja2 environment to use in offline compression.
|
||||||
def JINJA2_GET_ENVIRONMENT():
|
def JINJA2_GET_ENVIRONMENT():
|
||||||
alias = 'Jinja2'
|
alias = 'jinja2'
|
||||||
try:
|
try:
|
||||||
from django.template.loader import _engine_list
|
from django.template import engines
|
||||||
engines = _engine_list(alias)
|
return engines[alias].env
|
||||||
if engines:
|
|
||||||
engine = engines[0]
|
|
||||||
return engine.env
|
|
||||||
except InvalidTemplateEngineError:
|
except InvalidTemplateEngineError:
|
||||||
raise InvalidTemplateEngineError(
|
raise InvalidTemplateEngineError(
|
||||||
"Could not find config for '{}' "
|
"Could not find config for '{}' "
|
||||||
|
Reference in New Issue
Block a user