From 61ca98ebe3fb19b90882c9723f070f3e2905ea36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Garbely?= Date: Fri, 8 Jun 2018 10:41:48 +0200 Subject: [PATCH] [MIG] base_suspend_security: Migration to 11.0 --- base_suspend_security/README.rst | 3 ++- base_suspend_security/__init__.py | 1 - base_suspend_security/__manifest__.py | 5 ++--- base_suspend_security/base_suspend_security.py | 7 +++++-- base_suspend_security/models/__init__.py | 7 +++---- base_suspend_security/models/base.py | 2 +- base_suspend_security/models/ir_model_access.py | 4 ++-- base_suspend_security/models/ir_rule.py | 4 ++-- base_suspend_security/models/res_users.py | 2 +- base_suspend_security/tests/__init__.py | 1 - base_suspend_security/tests/test_base_suspend_security.py | 1 - 11 files changed, 18 insertions(+), 19 deletions(-) diff --git a/base_suspend_security/README.rst b/base_suspend_security/README.rst index 8307d1ec..60297e63 100644 --- a/base_suspend_security/README.rst +++ b/base_suspend_security/README.rst @@ -28,7 +28,7 @@ Known issues / Roadmap Bug Tracker =========== -Bugs are tracked on `GitHub Issues `_. +Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed feedback. @@ -40,6 +40,7 @@ Contributors * Holger Brunn * Laurent Mignon +* Frédéric Garbely Maintainer ---------- diff --git a/base_suspend_security/__init__.py b/base_suspend_security/__init__.py index cdb7d736..c450fc83 100644 --- a/base_suspend_security/__init__.py +++ b/base_suspend_security/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ############################################################################## # # This module copyright (C) 2015 Therp BV . diff --git a/base_suspend_security/__manifest__.py b/base_suspend_security/__manifest__.py index 2d3d0446..07a1bf58 100644 --- a/base_suspend_security/__manifest__.py +++ b/base_suspend_security/__manifest__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ############################################################################## # # This module copyright (C) 2015 Therp BV . @@ -19,8 +18,8 @@ ############################################################################## { "name": "Suspend security", - "version": "10.0.1.0.0", - "author": "Therp BV, Odoo Community Association (OCA)", + "version": "11.0.1.0.0", + "author": "Therp BV, brain-tec AG, Odoo Community Association (OCA)", "license": "AGPL-3", "category": "Hidden/Dependency", "summary": "Suspend security checks for a call", diff --git a/base_suspend_security/base_suspend_security.py b/base_suspend_security/base_suspend_security.py index dc7cdc46..caba4756 100644 --- a/base_suspend_security/base_suspend_security.py +++ b/base_suspend_security/base_suspend_security.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ############################################################################## # # This module copyright (C) 2015 Therp BV . @@ -17,6 +16,7 @@ # along with this program. If not, see . # ############################################################################## +from odoo.tools import pycompat class BaseSuspendSecurityUid(int): @@ -24,9 +24,12 @@ class BaseSuspendSecurityUid(int): return self def __eq__(self, other): - if isinstance(other, (int, long)): + if isinstance(other, pycompat.integer_types): return False return super(BaseSuspendSecurityUid, self).__int__() == other + def __hash__(self): + return super(BaseSuspendSecurityUid, self).__hash__() + def __iter__(self): yield super(BaseSuspendSecurityUid, self).__int__() diff --git a/base_suspend_security/models/__init__.py b/base_suspend_security/models/__init__.py index 029724b8..861ec124 100644 --- a/base_suspend_security/models/__init__.py +++ b/base_suspend_security/models/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ############################################################################## # # This module copyright (C) 2015 Therp BV . @@ -17,7 +16,7 @@ # along with this program. If not, see . # ############################################################################## -from . import ir_rule -from . import ir_model_access -from . import res_users from . import base +from . import ir_model_access +from . import ir_rule +from . import res_users diff --git a/base_suspend_security/models/base.py b/base_suspend_security/models/base.py index 53b462b9..ed705c6e 100644 --- a/base_suspend_security/models/base.py +++ b/base_suspend_security/models/base.py @@ -1,8 +1,8 @@ -# -*- coding: utf-8 -*- # Copyright 2016 ACSONE SA/NV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo import api, models + from ..base_suspend_security import BaseSuspendSecurityUid diff --git a/base_suspend_security/models/ir_model_access.py b/base_suspend_security/models/ir_model_access.py index f67d8632..f90d3dd4 100644 --- a/base_suspend_security/models/ir_model_access.py +++ b/base_suspend_security/models/ir_model_access.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ############################################################################## # # This module copyright (C) 2015 Therp BV (). @@ -17,7 +16,8 @@ # along with this program. If not, see . # ############################################################################## -from odoo import models, api, tools +from odoo import api, models, tools + from ..base_suspend_security import BaseSuspendSecurityUid diff --git a/base_suspend_security/models/ir_rule.py b/base_suspend_security/models/ir_rule.py index 21a121ec..111430f3 100644 --- a/base_suspend_security/models/ir_rule.py +++ b/base_suspend_security/models/ir_rule.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ############################################################################## # # This module copyright (C) 2015 Therp BV (). @@ -17,7 +16,8 @@ # along with this program. If not, see . # ############################################################################## -from odoo import models, api +from odoo import api, models + from ..base_suspend_security import BaseSuspendSecurityUid diff --git a/base_suspend_security/models/res_users.py b/base_suspend_security/models/res_users.py index a5e3b242..e7b16e90 100644 --- a/base_suspend_security/models/res_users.py +++ b/base_suspend_security/models/res_users.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ############################################################################## # # This module copyright (C) 2015 Therp BV (). @@ -18,6 +17,7 @@ # ############################################################################## from odoo import models + from ..base_suspend_security import BaseSuspendSecurityUid diff --git a/base_suspend_security/tests/__init__.py b/base_suspend_security/tests/__init__.py index 6ab88d09..af8225bd 100644 --- a/base_suspend_security/tests/__init__.py +++ b/base_suspend_security/tests/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ############################################################################## # # This module copyright (C) 2015 Therp BV . diff --git a/base_suspend_security/tests/test_base_suspend_security.py b/base_suspend_security/tests/test_base_suspend_security.py index 8e1bb5a6..82d15b9a 100644 --- a/base_suspend_security/tests/test_base_suspend_security.py +++ b/base_suspend_security/tests/test_base_suspend_security.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ############################################################################## # # This module copyright (C) 2015 Therp BV ().