odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] models: log source when "Comparing apples and oranges"

This commit is contained in:
Christophe Simonis 2015-02-27 15:57:13 +01:00
parent b11c49d6f6
commit e6396deb4e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openerp/models.py
View File

@ -49,7 +49,7 @@ import pytz
import re import re
import time import time
from collections import defaultdict, MutableMapping from collections import defaultdict, MutableMapping
from inspect import getmembers from inspect import getmembers, currentframe
import babel.dates import babel.dates
import dateutil.relativedelta import dateutil.relativedelta
@ -66,6 +66,7 @@ from .osv import fields
from .osv.query import Query from .osv.query import Query
from .tools import frozendict, lazy_property, ormcache from .tools import frozendict, lazy_property, ormcache
from .tools.config import config from .tools.config import config
from .tools.func import frame_codeinfo
from .tools.misc import CountingStream, DEFAULT_SERVER_DATETIME_FORMAT, DEFAULT_SERVER_DATE_FORMAT from .tools.misc import CountingStream, DEFAULT_SERVER_DATETIME_FORMAT, DEFAULT_SERVER_DATE_FORMAT
from .tools.safe_eval import safe_eval as eval from .tools.safe_eval import safe_eval as eval
from .tools.translate import _ from .tools.translate import _
@ -5474,7 +5475,9 @@ class BaseModel(object):
""" Test whether two recordsets are equivalent (up to reordering). """ """ Test whether two recordsets are equivalent (up to reordering). """
if not isinstance(other, BaseModel): if not isinstance(other, BaseModel):
if other: if other:
_logger.warning("Comparing apples and oranges: %s == %s", self, other) filename, lineno = frame_codeinfo(currentframe(), 1)
_logger.warning("Comparing apples and oranges: %r == %r (%s:%s)",
self, other, filename, lineno)
return False return False
return self._name == other._name and set(self._ids) == set(other._ids) return self._name == other._name and set(self._ids) == set(other._ids)