[FIX] web: use jinja2.FileSystemLoader instead of PackageLoader on windows
bzr revid: chs@openerp.com-20140307151431-5k24u6lnlypv1s64
This commit is contained in:
parent
d448a63c26
commit
36f2ff879a
|
@ -14,6 +14,7 @@ import hashlib
|
||||||
import os
|
import os
|
||||||
import re
|
import re
|
||||||
import simplejson
|
import simplejson
|
||||||
|
import sys
|
||||||
import time
|
import time
|
||||||
import urllib2
|
import urllib2
|
||||||
import zlib
|
import zlib
|
||||||
|
@ -37,10 +38,14 @@ from openerp.http import request, serialize_exception as _serialize_exception
|
||||||
|
|
||||||
_logger = logging.getLogger(__name__)
|
_logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
env = jinja2.Environment(
|
if hasattr(sys, 'frozen'):
|
||||||
loader=jinja2.PackageLoader('openerp.addons.web', "views"),
|
# When running on compiled windows binary, we don't have access to package loader.
|
||||||
autoescape=True
|
path = os.path.realpath(os.path.join(os.path.dirname(__file__), '..', 'views'))
|
||||||
)
|
loader = jinja2.FileSystemLoader(path)
|
||||||
|
else:
|
||||||
|
loader = jinja2.PackageLoader('openerp.addons.web', "views")
|
||||||
|
|
||||||
|
env = jinja2.Environment(loader=loader, autoescape=True)
|
||||||
env.filters["json"] = simplejson.dumps
|
env.filters["json"] = simplejson.dumps
|
||||||
|
|
||||||
#----------------------------------------------------------
|
#----------------------------------------------------------
|
||||||
|
|
Loading…
Reference in New Issue