From cbb563fd98adf074afa436d72e17b08973395ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Voet=20=28ryv=29?= Date: Tue, 9 Nov 2021 13:18:15 +0000 Subject: [PATCH] [REM] core: remove deadcode from models.py - Remove unused imports `AsIs` and `Collector` - Remove unused logger _schema - Remove unused function same_name - Remove unused attribute `_needaction` - Remove backward compatibility of `__new__` and `__init__` - Remove backward compatibility of `__export_rows` Also: - remove deprecated warning in api.py - remove the `__init__` from `ir.ui.menu`, it was useless because the cleaning of cache (`clear_caches`) is global (a call of `clear_caches` clean all cache method with a ormcache decoration) Part-of: odoo/odoo#79563 --- odoo/addons/base/models/ir_ui_menu.py | 4 ---- odoo/addons/base/tests/test_deprecation.py | 1 + odoo/api.py | 4 ---- odoo/models.py | 27 ++-------------------- 4 files changed, 3 insertions(+), 33 deletions(-) diff --git a/odoo/addons/base/models/ir_ui_menu.py b/odoo/addons/base/models/ir_ui_menu.py index 40657be0d6f..a77d4971fe4 100644 --- a/odoo/addons/base/models/ir_ui_menu.py +++ b/odoo/addons/base/models/ir_ui_menu.py @@ -21,10 +21,6 @@ class IrUiMenu(models.Model): _order = "sequence,id" _parent_store = True - def __init__(self, *args, **kwargs): - super(IrUiMenu, self).__init__(*args, **kwargs) - self.pool['ir.model.access'].register_cache_clearing_method(self._name, 'clear_caches') - name = fields.Char(string='Menu', required=True, translate=True) active = fields.Boolean(default=True) sequence = fields.Integer(default=10) diff --git a/odoo/addons/base/tests/test_deprecation.py b/odoo/addons/base/tests/test_deprecation.py index 9e74e4a5263..6b991843ec8 100644 --- a/odoo/addons/base/tests/test_deprecation.py +++ b/odoo/addons/base/tests/test_deprecation.py @@ -6,6 +6,7 @@ from odoo.tests.common import TransactionCase, tagged DEPRECATED_MODEL_ATTRIBUTES = [ 'view_init', + '_needaction', ] diff --git a/odoo/api.py b/odoo/api.py index 841cf1cdf58..82a3f45fef9 100644 --- a/odoo/api.py +++ b/odoo/api.py @@ -74,10 +74,6 @@ class Meta(type): if not key.startswith('__') and callable(value): # make the method inherit from decorators value = propagate(getattr(parent, key, None), value) - - if (getattr(value, '_api', None) or '').startswith('cr'): - _logger.warning("Deprecated method %s.%s in module %s", name, key, attrs.get('__module__')) - attrs[key] = value return type.__new__(meta, name, bases, attrs) diff --git a/odoo/models.py b/odoo/models.py index 32d4fed2829..221d63b9d70 100644 --- a/odoo/models.py +++ b/odoo/models.py @@ -46,7 +46,6 @@ import dateutil.relativedelta import psycopg2, psycopg2.extensions from lxml import etree from lxml.builder import E -from psycopg2.extensions import AsIs import odoo from . import SUPERUSER_ID @@ -55,7 +54,7 @@ from . import tools from .exceptions import AccessError, MissingError, ValidationError, UserError from .osv.query import Query from .tools import frozendict, lazy_classproperty, ormcache, \ - Collector, LastOrderedSet, OrderedSet, IterableGenerator, \ + LastOrderedSet, OrderedSet, IterableGenerator, \ groupby, discardattr, partition from .tools.config import config from .tools.func import frame_codeinfo @@ -67,10 +66,9 @@ from .tools import unique from .tools.lru import LRU _logger = logging.getLogger(__name__) -_schema = logging.getLogger(__name__ + '.schema') _unlink = logging.getLogger(__name__ + '.unlink') -regex_order = re.compile('^(\s*([a-z0-9:_]+|"[a-z0-9:_]+")(\s+(desc|asc))?\s*(,|$))+(?