[FIX] *: collection.<ABC> is deprecated

This commit is contained in:
Xavier Morel
2020-04-22 11:31:20 +00:00
parent d9c685a757
commit 9a93d3db11
2 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -2,7 +2,7 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
import ast
import collections
import collections.abc
import importlib
import inspect
import itertools
@@ -260,7 +260,7 @@ def load_information_from_description_file(module, mod_path=None):
# auto_install: [] to always auto_install a module regardless of its
# dependencies
auto_install = info.get('auto_install', info.get('active', False))
if isinstance(auto_install, collections.Iterable):
if isinstance(auto_install, collections.abc.Iterable):
info['auto_install'] = set(auto_install)
non_dependencies = info['auto_install'].difference(info['depends'])
assert not non_dependencies,\
+3 -3
View File
@@ -113,7 +113,7 @@ Finally, to instruct OpenERP to really use the unaccent function, you have to
start the server specifying the ``--unaccent`` flag.
"""
import collections
import collections.abc
import logging
import traceback
@@ -958,7 +958,7 @@ class expression(object):
op2 = (TERM_OPERATORS_NEGATION[operator]
if operator in NEGATIVE_TERM_OPERATORS else operator)
ids2 = [x[0] for x in comodel.name_search(right, domain or [], op2, limit=None)]
elif isinstance(right, collections.Iterable):
elif isinstance(right, collections.abc.Iterable):
ids2 = right
else:
ids2 = [right]
@@ -1018,7 +1018,7 @@ class expression(object):
op2 = (TERM_OPERATORS_NEGATION[operator]
if operator in NEGATIVE_TERM_OPERATORS else operator)
ids2 = [x[0] for x in comodel.name_search(right, domain or [], op2, limit=None)]
elif isinstance(right, collections.Iterable):
elif isinstance(right, collections.abc.Iterable):
ids2 = right
else:
ids2 = [right]