diff options
author | Raymond Hettinger <python@rcn.com> | 2010-09-05 05:57:35 (GMT) |
---|---|---|
committer | Raymond Hettinger <python@rcn.com> | 2010-09-05 05:57:35 (GMT) |
commit | 4c7c9af542d1dd8b3cb7f6ab58a5a2bda5e13900 (patch) | |
tree | 579b2e8e0b8f59bfb09f79f19fe06161777fa57d /Lib | |
parent | bb734c6707f531e0eddd0f48aba822e092c6190d (diff) | |
download | cpython-4c7c9af542d1dd8b3cb7f6ab58a5a2bda5e13900.zip cpython-4c7c9af542d1dd8b3cb7f6ab58a5a2bda5e13900.tar.gz cpython-4c7c9af542d1dd8b3cb7f6ab58a5a2bda5e13900.tar.bz2 |
Clean-up functools.total_ordering().
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/functools.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/functools.py b/Lib/functools.py index 1effc08..b2df390 100644 --- a/Lib/functools.py +++ b/Lib/functools.py @@ -65,7 +65,6 @@ def wraps(wrapped, return partial(update_wrapper, wrapped=wrapped, assigned=assigned, updated=updated) -_object_defaults = {object.__lt__, object.__le__, object.__gt__, object.__ge__} def total_ordering(cls): """Class decorator that fills in missing ordering methods""" convert = { @@ -82,9 +81,8 @@ def total_ordering(cls): ('__gt__', lambda self, other: not other >= self), ('__lt__', lambda self, other: not self >= other)] } - roots = set(dir(cls)) & set(convert) - # Remove default comparison operations defined on object. - roots -= {meth for meth in roots if getattr(cls, meth) in _object_defaults} + # Find comparisons not inherited from object. + roots = [op for op in convert if getattr(cls, op) is not getattr(object, op)] if not roots: raise ValueError('must define at least one ordering operation: < > <= >=') root = max(roots) # prefer __lt__ to __le__ to __gt__ to __ge__ |