diff --git a/addons/google_calendar/controllers/main.py b/addons/google_calendar/controllers/main.py index 1f307133ea0..233126bee64 100644 --- a/addons/google_calendar/controllers/main.py +++ b/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): diff --git a/addons/link_tracker/controller/main.py b/addons/link_tracker/controller/main.py index 1d7707fb65a..d902fef8a7c 100644 --- a/addons/link_tracker/controller/main.py +++ b/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 diff --git a/addons/report/models/report.py b/addons/report/models/report.py index 398bb7beade..caaee1f95a0 100644 --- a/addons/report/models/report.py +++ b/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 diff --git a/addons/web/__init__.py b/addons/web/__init__.py index a1a3f3105a8..ac0011716f6 100644 --- a/addons/web/__init__.py +++ b/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 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 diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py index 0b1d9bd78af..f3c9f5b4d28 100644 --- a/addons/website/controllers/main.py +++ b/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 diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py index bfae7d49b5f..14b5a0d8f1c 100644 --- a/addons/website/models/ir_qweb.py +++ b/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 diff --git a/addons/website/models/website.py b/addons/website/models/website.py index f45d9b505c3..b4a4b3d9ffa 100644 --- a/addons/website/models/website.py +++ b/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__) diff --git a/addons/website_blog/controllers/main.py b/addons/website_blog/controllers/main.py index 3ef3c670256..f7d8ce7be7d 100644 --- a/addons/website_blog/controllers/main.py +++ b/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 diff --git a/addons/website_crm_partner_assign/controllers/main.py b/addons/website_crm_partner_assign/controllers/main.py index a2f4ce16602..dd13570b4dd 100644 --- a/addons/website_crm_partner_assign/controllers/main.py +++ b/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 _ diff --git a/addons/website_customer/controllers/main.py b/addons/website_customer/controllers/main.py index 5b6aec225f3..9af35347a82 100644 --- a/addons/website_customer/controllers/main.py +++ b/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 diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py index 01cb42d3cc3..98c7ae854c8 100644 --- a/addons/website_forum/controllers/main.py +++ b/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 diff --git a/addons/website_google_map/controllers/main.py b/addons/website_google_map/controllers/main.py index 01a547920bf..101d3382dfe 100644 --- a/addons/website_google_map/controllers/main.py +++ b/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 diff --git a/addons/website_links/controller/main.py b/addons/website_links/controller/main.py index a91021161e2..65a9a750c0e 100644 --- a/addons/website_links/controller/main.py +++ b/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 diff --git a/addons/website_membership/controllers/main.py b/addons/website_membership/controllers/main.py index c682dca2ad5..df953d74d40 100644 --- a/addons/website_membership/controllers/main.py +++ b/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 _ diff --git a/addons/website_quote/controllers/main.py b/addons/website_quote/controllers/main.py index 42b5b0b2dac..02a68ddec6d 100644 --- a/addons/website_quote/controllers/main.py +++ b/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 diff --git a/addons/website_rating_project_issue/controllers/main.py b/addons/website_rating_project_issue/controllers/main.py index c46e32a6b0a..4797ee4b0c7 100644 --- a/addons/website_rating_project_issue/controllers/main.py +++ b/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 diff --git a/addons/website_sale/controllers/website_mail.py b/addons/website_sale/controllers/website_mail.py index cf677e0a51a..5474d21e090 100644 --- a/addons/website_sale/controllers/website_mail.py +++ b/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 diff --git a/addons/website_slides/controllers/main.py b/addons/website_slides/controllers/main.py index cadb72a2145..651507df075 100644 --- a/addons/website_slides/controllers/main.py +++ b/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 _ diff --git a/addons/website_twitter/controllers/main.py b/addons/website_twitter/controllers/main.py index 2e1347464b9..9d0e2c40edd 100644 --- a/addons/website_twitter/controllers/main.py +++ b/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): diff --git a/openerp/addons/base/ir/ir_qweb/ir_qweb.py b/openerp/addons/base/ir/ir_qweb/ir_qweb.py index 88e6ee95307..d5bf6a1f64d 100644 --- a/openerp/addons/base/ir/ir_qweb/ir_qweb.py +++ b/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