7 files changed, 37 insertions, 31 deletions
diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py
index d9dd0a91041..6ff3d1404f9 100644
--- a/addons/website_forum/controllers/main.py
+++ b/addons/website_forum/controllers/main.py
@@ -1,19 +1,20 @@
 # -*- coding: utf-8 -*-
-from datetime import datetime
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import base64
+import json
+import lxml
 import werkzeug.exceptions
 import werkzeug.urls
 import werkzeug.wrappers
-import json
-import lxml
+
+from datetime import datetime
 from urllib2 import urlopen, URLError
-import base64
 
-import openerp
-from openerp import tools, _
-from openerp import http
-from openerp.addons.web.controllers.main import binary_content
-from openerp.http import request
-from openerp.addons.website.models.website import slug
+from odoo import http, modules, SUPERUSER_ID, tools, _
+from odoo.addons.web.controllers.main import binary_content
+from odoo.addons.website.models.website import slug
+from odoo.http import request
 
 
 class WebsiteForum(http.Controller):
@@ -562,10 +563,10 @@ class WebsiteForum(http.Controller):
 
     @http.route(['/forum/user/<int:user_id>/avatar'], type='http', auth="public", website=True)
     def user_avatar(self, user_id=0, **post):
-        status, headers, content = binary_content(model='res.users', id=user_id, field='image_medium', default_mimetype='image/png', env=request.env(user=openerp.SUPERUSER_ID))
+        status, headers, content = binary_content(model='res.users', id=user_id, field='image_medium', default_mimetype='image/png', env=request.env(user=SUPERUSER_ID))
 
         if not content:
-            img_path = openerp.modules.get_module_resource('web', 'static/src/img', 'placeholder.png')
+            img_path = modules.get_module_resource('web', 'static/src/img', 'placeholder.png')
             with open(img_path, 'rb') as f:
                 image = f.read()
             content = image.encode('base64')
diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py
index 3560197f17a..d12b7d77626 100644
--- a/addons/website_forum/models/forum.py
+++ b/addons/website_forum/models/forum.py
@@ -1,21 +1,17 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from datetime import datetime
 import itertools
 import logging
 import math
 import re
 import uuid
+
+from datetime import datetime
 from werkzeug.exceptions import Forbidden
 
-from openerp import _
-from openerp import api, fields, models
-from openerp import http
-from openerp import modules
-from openerp import tools
-from openerp import SUPERUSER_ID
-from openerp.addons.website.models.website import slug
-from openerp.exceptions import UserError, ValidationError
+from odoo import api, fields, models, modules, tools, SUPERUSER_ID, _
+from odoo.exceptions import UserError, ValidationError
 
 _logger = logging.getLogger(__name__)
 
diff --git a/addons/website_forum/models/gamification.py b/addons/website_forum/models/gamification.py
index 69ccd1ba769..73819aa97f5 100644
--- a/addons/website_forum/models/gamification.py
+++ b/addons/website_forum/models/gamification.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from openerp import models, fields, api
+from odoo import models, fields
 
 
 class Challenge(models.Model):
@@ -8,6 +9,7 @@ class Challenge(models.Model):
 
     category = fields.Selection(selection_add=[('forum', 'Website / Forum')])
 
+
 class Badge(models.Model):
     _inherit = 'gamification.badge'
 
diff --git a/addons/website_forum/models/res_users.py b/addons/website_forum/models/res_users.py
index cc51b80741e..78d0b7c8321 100644
--- a/addons/website_forum/models/res_users.py
+++ b/addons/website_forum/models/res_users.py
@@ -1,10 +1,12 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from datetime import datetime
 import hashlib
+
+from datetime import datetime
 from urllib import urlencode
 
-from openerp import models, fields, api
+from odoo import api, fields, models
 
 
 class Users(models.Model):
diff --git a/addons/website_forum/tests/common.py b/addons/website_forum/tests/common.py
index 279ebc608ee..f2f074aeff0 100644
--- a/addons/website_forum/tests/common.py
+++ b/addons/website_forum/tests/common.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from openerp.tests import common
+from odoo.tests import common
 
 KARMA = {
     'ask': 5, 'ans': 10,
diff --git a/addons/website_forum/tests/test_forum.py b/addons/website_forum/tests/test_forum.py
index 7adf0141df5..344122abe2f 100644
--- a/addons/website_forum/tests/test_forum.py
+++ b/addons/website_forum/tests/test_forum.py
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from .common import KARMA, TestForumCommon
 from ..models.forum import KarmaError
-from openerp.exceptions import UserError, AccessError
-from openerp.tools import mute_logger
+from odoo.exceptions import UserError, AccessError
+from odoo.tools import mute_logger
 
 
 class TestForum(TestForumCommon):
diff --git a/addons/website_forum/tests/test_forum_process.py b/addons/website_forum/tests/test_forum_process.py
index 18f8812346e..ef8b290a075 100644
--- a/addons/website_forum/tests/test_forum_process.py
+++ b/addons/website_forum/tests/test_forum_process.py
@@ -1,8 +1,11 @@
-import openerp.tests
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-@openerp.tests.common.at_install(False)
-@openerp.tests.common.post_install(True)
-class TestUi(openerp.tests.HttpCase):
+import odoo.tests
+
+
+@odoo.tests.common.at_install(False)
+@odoo.tests.common.post_install(True)
+class TestUi(odoo.tests.HttpCase):
     def test_01_admin_forum_tour(self):
         self.phantom_js("/", "odoo.__DEBUG__.services['web_tour.tour'].run('question')", "odoo.__DEBUG__.services['web_tour.tour'].tours.question", login="admin")