summaryrefslogtreecommitdiff
path: root/addons/web/controllers/main.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-08-19 16:59:29 +0200
committerChristophe Simonis <chs@odoo.com>2016-08-19 16:59:29 +0200
commitbc1a0a32ca80aaadd52e66115fe9c9ad4b26c2e0 (patch)
treee2ca10dde39d78301e100c76a76f3ab86fd509f3 /addons/web/controllers/main.py
parent2331bbf4b05d9e9f2ad5e56814ad440683882e3d (diff)
parent58cbcbae318f613c0e8239fbcfea59d0c3c33612 (diff)
[MERGE] forward port branch 9.0 up to 58cbcba
Diffstat (limited to 'addons/web/controllers/main.py')
-rw-r--r--addons/web/controllers/main.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 645c1d9b32d..616b7352053 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -25,11 +25,6 @@ import werkzeug.utils
import werkzeug.wrappers
from openerp.api import Environment
-try:
- import xlwt
-except ImportError:
- xlwt = None
-
import openerp
import openerp.modules.registry
from openerp.addons.base.ir.ir_qweb import AssetsBundle, QWebTemplateNotFound
@@ -37,7 +32,7 @@ from openerp.modules import get_resource_path
from openerp.tools import topological_sort
from openerp.tools.translate import _
from openerp.tools import ustr
-from openerp.tools.misc import str2bool
+from openerp.tools.misc import str2bool, xlwt
from openerp import http
from openerp.http import request, serialize_exception as _serialize_exception
from openerp.exceptions import AccessError