summaryrefslogtreecommitdiff
path: root/addons/web_editor
diff options
context:
space:
mode:
authorfwi-odoo <fwi@odoo.com>2016-07-22 11:43:12 +0200
committerThibault Delavallée <tde@openerp.com>2016-08-03 13:42:05 +0200
commitd4e813b87336984d52d9ebaeb7db16e0203013f6 (patch)
treee65276f2898188b30673d2fe940d391f89b3d676 /addons/web_editor
parentf88a8894099d735210faf72953ee91587ae8142f (diff)
[REF] web, *: change deprecated import openerp.addons.web.http to odoo.http
We also remove the mock in web as there is no need for it anymore.
Diffstat (limited to 'addons/web_editor')
-rw-r--r--addons/web_editor/controllers/main.py2
-rw-r--r--addons/web_editor/models/ir_attachment.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/web_editor/controllers/main.py b/addons/web_editor/controllers/main.py
index c9daf246691..fa891ee296c 100644
--- a/addons/web_editor/controllers/main.py
+++ b/addons/web_editor/controllers/main.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
from openerp.http import request, STATIC_CACHE
-from openerp.addons.web import http
+from openerp import http
import json
import io
from PIL import Image, ImageFont, ImageDraw
diff --git a/addons/web_editor/models/ir_attachment.py b/addons/web_editor/models/ir_attachment.py
index f489aa90aa2..135d82bc592 100644
--- a/addons/web_editor/models/ir_attachment.py
+++ b/addons/web_editor/models/ir_attachment.py
@@ -4,7 +4,7 @@ from openerp.osv import osv, fields
import contextlib
from sys import maxint
-from openerp.addons.web.http import request
+from openerp.http import request
import datetime
import hashlib
import time