1. Jason R. Coombs
  2. cpython-pcbuild


Raymond Hettinger  committed 8bb162b

Clean-up functools.total_ordering().

  • Participants
  • Parent commits a8d54e8
  • Branches default

Comments (0)

Files changed (2)

File Lib/functools.py

View file
  • Ignore whitespace
     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 = {
                    ('__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__

File Misc/NEWS

View file
  • Ignore whitespace
 - Issue #9501: Fixed logging regressions in cleanup code.
-- Fix functools.total_ordering() to actually work.
+- Fix functools.total_ordering() to skip methods inherited from object().
 - Issue #9572: Importlib should not raise an exception if a directory it
   thought it needed to create was done concurrently by another process.