run total_ordering() tests, and fix the function (default comparisons shouldn't be...

diff --git a/Lib/functools.py b/Lib/functools.py
index bd1334b578e4dd4becf5a75096782d02b4b0e1c1..7ce6bc2cea4b3dbadc346b7425f93e1cd3e318a8 100644 (file)
--- a/Lib/functools.py
+++ b/Lib/functools.py
@@ -65,6 +65,7 @@ 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 = {
@@ -81,7 +82,9 @@ def total_ordering(cls):
                    ('__gt__', lambda self, other: not other >= self),
                    ('__lt__', lambda self, other: not self >= other)]
     }
-    roots = set(dir(cls)) & set(convert)
+    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}
     if not roots:
         raise ValueError('must define at least one ordering operation: < > <= >=')
     root = max(roots)       # prefer __lt__ to __le__ to __gt__ to __ge__

diff --git a/Lib/test/test_functools.py b/Lib/test/test_functools.py
index 211ef1806cd4f35f34b12b8a0ac50259bf192bb0..41a98a2060c8c08260c3b457d138441e6df79f65 100644 (file)
--- a/Lib/test/test_functools.py
+++ b/Lib/test/test_functools.py
@@ -481,7 +481,7 @@ class TestTotalOrdering(unittest.TestCase):
         # new methods should not overwrite existing
         @functools.total_ordering
         class A(int):
-            raise Exception()
+            pass
         self.assert_(A(1) < A(2))
         self.assert_(A(2) > A(1))
         self.assert_(A(1) <= A(2))
@@ -564,6 +564,7 @@ def test_main(verbose=None):
         TestPartialSubclass,
         TestPythonPartial,
         TestUpdateWrapper,
+        TestTotalOrdering,
         TestWraps,
         TestReduce,
         TestLRU,