[Python-checkins] r84518 - in python/branches/py3k: Lib/functools.py Misc/NEWS

Sun Sep 5 07:57:35 CEST 2010

Author: raymond.hettinger
Date: Sun Sep 5 07:57:35 2010
New Revision: 84518
Log:
Clean-up functools.total_ordering().
Modified:
 python/branches/py3k/Lib/functools.py
 python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Lib/functools.py
==============================================================================

--- python/branches/py3k/Lib/functools.py	(original)
+++ python/branches/py3k/Lib/functools.py	Sun Sep 5 07:57:35 2010
@@ -65,7 +65,6 @@
 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 @@
 ('__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__
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sun Sep 5 07:57:35 2010
@@ -222,7 +222,7 @@
 
 - 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.
