import cleanups part1

bzr revid: al@openerp.com-20131022170659-kg9err029ha22evh

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
 

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
 

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__)
 

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])}

addons/im/im.py

@@ -18,19 +18,19 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
+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__)
 

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', "."),

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
 
 

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/<int:mail_id>/blank.gif', type='http', auth='admin')

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__)