From 3d8b7984bece705354e774213064c9540f5280c5 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 22 Oct 2013 19:06:59 +0200 Subject: [PATCH] import cleanups part1 bzr revid: al@openerp.com-20131022170659-kg9err029ha22evh --- addons/auth_oauth/controllers/main.py | 4 ++-- addons/auth_openid/controllers/main.py | 4 ++-- addons/auth_signup/controllers/main.py | 4 ++-- addons/edi/controllers/main.py | 15 ++++++++------- addons/im/im.py | 16 ++++++++-------- addons/im_livechat/im_livechat.py | 9 +++++---- addons/mail/controllers/main.py | 2 +- addons/mass_mailing/controllers/main.py | 5 ++--- addons/point_of_sale/controllers/main.py | 4 ++-- 9 files changed, 32 insertions(+), 31 deletions(-) diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py index 35a06871696..bedf32ae776 100644 --- a/addons/auth_oauth/controllers/main.py +++ b/addons/auth_oauth/controllers/main.py @@ -7,8 +7,8 @@ from werkzeug.exceptions import BadRequest import openerp from openerp import SUPERUSER_ID -import openerp.addons.web.http as http -from openerp.addons.web.http import request +from openerp import http +from openerp.http import request from openerp.addons.web.controllers.main import db_monodb, set_cookie_and_redirect, login_and_redirect from openerp.modules.registry import RegistryManager diff --git a/addons/auth_openid/controllers/main.py b/addons/auth_openid/controllers/main.py index a4ef1bfa07b..534d1b01a9c 100644 --- a/addons/auth_openid/controllers/main.py +++ b/addons/auth_openid/controllers/main.py @@ -38,8 +38,8 @@ import openerp from openerp import SUPERUSER_ID from openerp.modules.registry import RegistryManager from openerp.addons.web.controllers.main import login_and_redirect, set_cookie_and_redirect -import openerp.addons.web.http as http -from openerp.addons.web.http import request +import openerp.http as http +from openerp.http import request from .. import utils diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py index e42dc64151f..a778cbcf061 100644 --- a/addons/auth_signup/controllers/main.py +++ b/addons/auth_signup/controllers/main.py @@ -21,10 +21,10 @@ import logging import openerp +from openerp import http +from openerp.http import request from openerp.modules.registry import RegistryManager from ..res_users import SignupError -import openerp.addons.web.http as http -from openerp.addons.web.http import request _logger = logging.getLogger(__name__) diff --git a/addons/edi/controllers/main.py b/addons/edi/controllers/main.py index 7e27428b63b..3f77cced386 100644 --- a/addons/edi/controllers/main.py +++ b/addons/edi/controllers/main.py @@ -1,15 +1,15 @@ import simplejson import urllib -import openerp.addons.web.http as openerpweb +import openerp import openerp.addons.web.controllers.main as webmain class EDI(openerpweb.Controller): - # http://hostname:8069/edi/import_url?url=URIEncodedURL - _cp_path = "/edi" - @openerpweb.httprequest - def import_url(self, req, url): + @openerp.http.route('/edi/import_url', type='http', auth='none') + def import_url(self, url): + # http://hostname:8069/edi/import_url?url=URIEncodedURL + req = openerp.http.request modules = webmain.module_boot(req) + ['edi'] modules_str = ','.join(modules) modules_json = simplejson.dumps(modules) @@ -26,8 +26,9 @@ class EDI(openerpweb.Controller): 'init': 's.edi.edi_import("%s");' % safe_url, } - @openerpweb.jsonrequest - def import_edi_url(self, req, url): + @openerp.http.route('/edi/import_edi_url', type='http', auth='none') + def import_edi_url(self, url): + req = openerp.http.request result = req.session.proxy('edi').import_edi_url(req.session._db, req.session._uid, req.session._password, url) if len(result) == 1: return {"action": webmain.clean_action(req, result[0][2])} diff --git a/addons/im/im.py b/addons/im/im.py index 3c4f0bfcd14..fd87dbacbff 100644 --- a/addons/im/im.py +++ b/addons/im/im.py @@ -18,19 +18,19 @@ # along with this program. If not, see . # ############################################################################## +import datetime +import json +import logging +import select +import time import openerp import openerp.tools.config import openerp.modules.registry -import openerp.addons.web.http as http -from openerp.addons.web.http import request -from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT -import datetime +from openerp import http +from openerp.http import request from openerp.osv import osv, fields -import time -import logging -import json -import select +from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT _logger = logging.getLogger(__name__) diff --git a/addons/im_livechat/im_livechat.py b/addons/im_livechat/im_livechat.py index 81d3d61c6b4..cf8060596d7 100644 --- a/addons/im_livechat/im_livechat.py +++ b/addons/im_livechat/im_livechat.py @@ -19,15 +19,16 @@ # ############################################################################## -import openerp -import openerp.addons.im.im as im import json import random import jinja2 + +import openerp +import openerp.addons.im.im as im from openerp.osv import osv, fields from openerp import tools -import openerp.addons.web.http as http -from openerp.addons.web.http import request +from openerp.http as http +from openerp.http import request env = jinja2.Environment( loader=jinja2.PackageLoader('openerp.addons.im_livechat', "."), diff --git a/addons/mail/controllers/main.py b/addons/mail/controllers/main.py index c5ef8bac92d..c2e15c4a12f 100644 --- a/addons/mail/controllers/main.py +++ b/addons/mail/controllers/main.py @@ -3,7 +3,7 @@ import psycopg2 import openerp from openerp import SUPERUSER_ID -import openerp.addons.web.http as http +from openerp import http from openerp.addons.web.controllers.main import content_disposition diff --git a/addons/mass_mailing/controllers/main.py b/addons/mass_mailing/controllers/main.py index 3ca238256b1..ac1531d7192 100644 --- a/addons/mass_mailing/controllers/main.py +++ b/addons/mass_mailing/controllers/main.py @@ -1,7 +1,6 @@ -import openerp.addons.web.http as http -from openerp.addons.web.http import request - +from openerp import http +from openerp.http import request class MassMailController(http.Controller): @http.route('/mail/track//blank.gif', type='http', auth='admin') diff --git a/addons/point_of_sale/controllers/main.py b/addons/point_of_sale/controllers/main.py index 419f5bc2efa..2461fe90b79 100644 --- a/addons/point_of_sale/controllers/main.py +++ b/addons/point_of_sale/controllers/main.py @@ -6,8 +6,8 @@ import openerp import time import random -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.web.controllers.main import manifest_list, module_boot, html_template _logger = logging.getLogger(__name__)