[Python-checkins] r84279 - in python/branches/py3k/Lib: functools.py test/test_functools.py
benjamin.peterson
python-checkins at python.org
Mon Aug 23 19:40:33 CEST 2010
Author: benjamin.peterson
Date: Mon Aug 23 19:40:33 2010
New Revision: 84279
Log:
run total_ordering() tests, and fix the function (default comparisons shouldn't be considered)
Modified:
python/branches/py3k/Lib/functools.py
python/branches/py3k/Lib/test/test_functools.py
Modified: python/branches/py3k/Lib/functools.py
==============================================================================
--- python/branches/py3k/Lib/functools.py (original)
+++ python/branches/py3k/Lib/functools.py Mon Aug 23 19:40:33 2010
@@ -65,6 +65,7 @@
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 @@
('__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__
Modified: python/branches/py3k/Lib/test/test_functools.py
==============================================================================
--- python/branches/py3k/Lib/test/test_functools.py (original)
+++ python/branches/py3k/Lib/test/test_functools.py Mon Aug 23 19:40:33 2010
@@ -481,7 +481,7 @@
# 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 @@
TestPartialSubclass,
TestPythonPartial,
TestUpdateWrapper,
+ TestTotalOrdering,
TestWraps,
TestReduce,
TestLRU,
More information about the Python-checkins
mailing list