[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.

addons/google_calendar/controllers/main.py

@@ -1,5 +1,5 @@
-import openerp.addons.web.http as http
-from openerp.addons.web.http import request
+import openerp.http as http
+from openerp.http import request
 
 
 class google_calendar_controller(http.Controller):

addons/link_tracker/controller/main.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import werkzeug
 
-from openerp.addons.web import http
+from openerp import http
 from openerp.http import request
 
 

addons/report/models/report.py

@@ -6,7 +6,7 @@ from odoo.exceptions import AccessError
 from odoo.sql_db import TestCursor
 from odoo.tools import config
 from odoo.tools.misc import find_in_path
-from odoo.addons.web.http import request
+from odoo.http import request
 from odoo.tools.safe_eval import safe_eval as eval
 from odoo.exceptions import UserError
 

addons/web/__init__.py

@@ -1,12 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import sys
-
-# Mock deprecated openerp.addons.web.http module
-import openerp.http
-sys.modules['openerp.addons.web.http'] = openerp.http
-http = openerp.http
-
 import controllers
 import models

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

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

addons/website/controllers/main.py

@@ -13,7 +13,7 @@ import werkzeug.wrappers
 
 import openerp
 from openerp.addons.web.controllers.main import WebClient, Binary
-from openerp.addons.web import http
+from openerp import http
 from openerp.http import request
 from openerp.osv.orm import browse_record
 from openerp.addons.website.models.website import slug

addons/website/models/ir_qweb.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from openerp.addons.web.http import request
+from openerp.http import request
 from openerp.osv import orm
 import ast
 

addons/website/models/website.py

@@ -21,7 +21,7 @@ from openerp.tools.translate import _
 from openerp.osv import orm, osv, fields
 from openerp.tools import html_escape as escape, ustr, image_resize_and_sharpen, image_save_for_web
 from openerp.tools.safe_eval import safe_eval
-from openerp.addons.web.http import request
+from openerp.http import request
 from werkzeug.exceptions import NotFound
 
 logger = logging.getLogger(__name__)

addons/website_blog/controllers/main.py

@@ -5,8 +5,8 @@ import json
 import werkzeug
 
 from openerp import tools
-from openerp.addons.web import http
-from openerp.addons.web.http import request
+from openerp import http
+from openerp.http import request
 from openerp.addons.website.models.website import slug, unslug
 from odoo.addons.website.controllers.main import QueryURL
 from openerp.exceptions import UserError

addons/website_crm_partner_assign/controllers/main.py

@@ -7,8 +7,8 @@ import werkzeug
 from collections import OrderedDict
 
 from odoo import fields
-from odoo.addons.web import http
-from odoo.addons.web.http import request
+from odoo import http
+from odoo.http import request
 from odoo.addons.website.models.website import slug, unslug
 from odoo.addons.website_partner.controllers.main import WebsitePartnerPage
 from odoo.tools.translate import _

addons/website_customer/controllers/main.py

@@ -3,10 +3,10 @@
 
 import openerp
 from openerp import SUPERUSER_ID
-from openerp.addons.web import http
+from openerp import http
 from openerp.addons.website.models.website import unslug
 from openerp.tools.translate import _
-from openerp.addons.web.http import request
+from openerp.http import request
 import werkzeug.urls
 
 

addons/website_forum/controllers/main.py

@@ -10,9 +10,9 @@ import base64
 
 import openerp
 from openerp import tools, _
-from openerp.addons.web import http
+from openerp import http
 from openerp.addons.web.controllers.main import binary_content
-from openerp.addons.web.http import request
+from openerp.http import request
 from openerp.addons.website.models.website import slug
 
 

addons/website_google_map/controllers/main.py

@@ -2,8 +2,8 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 import json
 
-from odoo.addons.web import http
-from odoo.addons.web.http import request
+from odoo import http
+from odoo.http import request
 from odoo.tools import html_escape as escape
 
 

addons/website_links/controller/main.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import werkzeug
 
-from openerp.addons.web import http
+from openerp import http
 from openerp.http import request
 
 

addons/website_membership/controllers/main.py

@@ -5,8 +5,8 @@ import werkzeug.urls
 
 from odoo import fields
 
-from odoo.addons.web import http
-from odoo.addons.web.http import request
+from odoo import http
+from odoo.http import request
 from odoo.addons.website.models.website import unslug
 from odoo.tools.translate import _
 

addons/website_quote/controllers/main.py

@@ -2,8 +2,8 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from openerp import SUPERUSER_ID
-from openerp.addons.web import http
-from openerp.addons.web.http import request
+from openerp import http
+from openerp.http import request
 import werkzeug
 import datetime
 import time

addons/website_rating_project_issue/controllers/main.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from openerp.addons.web import http
-from openerp.addons.web.http import request
+from openerp import http
+from openerp.http import request
 
 import datetime
 from werkzeug.exceptions import NotFound

addons/website_sale/controllers/website_mail.py

@@ -3,7 +3,7 @@
 import urlparse
 
 from odoo import http
-from odoo.addons.web.http import request
+from odoo.http import request
 
 from odoo.addons.website_mail.controllers.main import WebsiteMail
 

addons/website_slides/controllers/main.py

@@ -3,7 +3,7 @@ import base64
 import logging
 import werkzeug
 
-from openerp.addons.web import http
+from openerp import http
 from openerp.exceptions import AccessError, UserError
 from openerp.http import request
 from openerp.tools.translate import _

addons/website_twitter/controllers/main.py

@@ -3,8 +3,8 @@
 
 import json
 from odoo import _
-from odoo.addons.web import http
-from odoo.addons.web.http import request
+from odoo import http
+from odoo.http import request
 
 
 class Twitter(http.Controller):

openerp/addons/base/ir/ir_qweb/ir_qweb.py

@@ -10,7 +10,7 @@ from collections import OrderedDict
 
 from openerp import api, models, tools
 from openerp.tools import safe_eval
-from openerp.addons.web.http import request
+from openerp.http import request
 from odoo.modules.module import get_resource_path
 import json
 from time import time