2 files changed, 10 insertions, 6 deletions
diff --git a/addons/base_import_module/controllers/__init__.py b/addons/base_import_module/controllers/__init__.py
index 8ee9bae18d9..a84d81a791b 100644
--- a/addons/base_import_module/controllers/__init__.py
+++ b/addons/base_import_module/controllers/__init__.py
@@ -1 +1,2 @@
+# -*- coding: utf-8 -*-
 import main
diff --git a/addons/base_import_module/controllers/main.py b/addons/base_import_module/controllers/main.py
index 4b51e69f096..1bc7ab0a15f 100644
--- a/addons/base_import_module/controllers/main.py
+++ b/addons/base_import_module/controllers/main.py
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 import functools
-import openerp
-from openerp.http import Controller, route, request, Response
+
+from odoo import _
+from odoo.exceptions import AccessError
+from odoo.http import Controller, route, request, Response
 
 def webservice(f):
     @functools.wraps(f)
@@ -12,20 +14,21 @@ def webservice(f):
             return Response(response=str(e), status=500)
     return wrap
 
+
 class ImportModule(Controller):
 
     def check_user(self, uid=None):
         if uid is None:
             uid = request.uid
-        is_admin = request.registry['res.users']._is_admin(request.cr, uid, [uid])
+        is_admin = request.env['res.users'].browse(uid)._is_admin()
         if not is_admin:
-            raise openerp.exceptions.AccessError("Only administrators can upload a module")
+            raise AccessError(_("Only administrators can upload a module"))
 
     @route('/base_import_module/login', type='http', auth='none', methods=['POST'], csrf=False)
     @webservice
     def login(self, login, password, db=None):
         if db and db != request.db:
-            raise Exception("Could not select database '%s'" % db)
+            raise Exception(_("Could not select database '%s'") % db)
         uid = request.session.authenticate(request.db, login, password)
         if not uid:
             return Response(response="Wrong login/password", status=401)
@@ -39,4 +42,4 @@ class ImportModule(Controller):
     def upload(self, mod_file=None, force='', **kw):
         self.check_user()
         force = True if force == '1' else False
-        return request.registry['ir.module.module'].import_zipfile(request.cr, request.uid, mod_file, force=force, context=request.context)[0]
+        return request.env['ir.module.module'].import_zipfile(mod_file, force=force)[0]