2001-01-18 23:48:05 +08:00
|
|
|
# Tests for rich comparisons
|
|
|
|
|
2003-04-30 05:31:19 +08:00
|
|
|
import unittest
|
|
|
|
from test import test_support
|
|
|
|
|
|
|
|
import operator
|
2001-01-18 23:48:05 +08:00
|
|
|
|
|
|
|
class Number:
|
|
|
|
|
|
|
|
def __init__(self, x):
|
|
|
|
self.x = x
|
|
|
|
|
|
|
|
def __lt__(self, other):
|
|
|
|
return self.x < other
|
|
|
|
|
|
|
|
def __le__(self, other):
|
|
|
|
return self.x <= other
|
|
|
|
|
|
|
|
def __eq__(self, other):
|
|
|
|
return self.x == other
|
|
|
|
|
|
|
|
def __ne__(self, other):
|
|
|
|
return self.x != other
|
|
|
|
|
|
|
|
def __gt__(self, other):
|
|
|
|
return self.x > other
|
|
|
|
|
|
|
|
def __ge__(self, other):
|
|
|
|
return self.x >= other
|
|
|
|
|
|
|
|
def __cmp__(self, other):
|
2007-08-30 07:37:32 +08:00
|
|
|
raise test_support.TestFailed("Number.__cmp__() should not be called")
|
2001-01-18 23:48:05 +08:00
|
|
|
|
|
|
|
def __repr__(self):
|
2003-04-30 05:31:19 +08:00
|
|
|
return "Number(%r)" % (self.x, )
|
2001-01-18 23:48:05 +08:00
|
|
|
|
|
|
|
class Vector:
|
|
|
|
|
|
|
|
def __init__(self, data):
|
|
|
|
self.data = data
|
|
|
|
|
|
|
|
def __len__(self):
|
|
|
|
return len(self.data)
|
|
|
|
|
|
|
|
def __getitem__(self, i):
|
|
|
|
return self.data[i]
|
|
|
|
|
|
|
|
def __setitem__(self, i, v):
|
|
|
|
self.data[i] = v
|
|
|
|
|
|
|
|
def __hash__(self):
|
2007-08-30 07:37:32 +08:00
|
|
|
raise TypeError("Vectors cannot be hashed")
|
2001-01-18 23:48:05 +08:00
|
|
|
|
2006-11-29 03:15:13 +08:00
|
|
|
def __bool__(self):
|
2007-08-30 07:37:32 +08:00
|
|
|
raise TypeError("Vectors cannot be used in Boolean contexts")
|
2001-01-18 23:48:05 +08:00
|
|
|
|
|
|
|
def __cmp__(self, other):
|
2007-08-30 07:37:32 +08:00
|
|
|
raise test_support.TestFailed("Vector.__cmp__() should not be called")
|
2001-01-18 23:48:05 +08:00
|
|
|
|
|
|
|
def __repr__(self):
|
2003-04-30 05:31:19 +08:00
|
|
|
return "Vector(%r)" % (self.data, )
|
2001-01-18 23:48:05 +08:00
|
|
|
|
|
|
|
def __lt__(self, other):
|
|
|
|
return Vector([a < b for a, b in zip(self.data, self.__cast(other))])
|
|
|
|
|
|
|
|
def __le__(self, other):
|
|
|
|
return Vector([a <= b for a, b in zip(self.data, self.__cast(other))])
|
|
|
|
|
|
|
|
def __eq__(self, other):
|
|
|
|
return Vector([a == b for a, b in zip(self.data, self.__cast(other))])
|
|
|
|
|
|
|
|
def __ne__(self, other):
|
|
|
|
return Vector([a != b for a, b in zip(self.data, self.__cast(other))])
|
|
|
|
|
|
|
|
def __gt__(self, other):
|
|
|
|
return Vector([a > b for a, b in zip(self.data, self.__cast(other))])
|
|
|
|
|
|
|
|
def __ge__(self, other):
|
|
|
|
return Vector([a >= b for a, b in zip(self.data, self.__cast(other))])
|
|
|
|
|
|
|
|
def __cast(self, other):
|
|
|
|
if isinstance(other, Vector):
|
|
|
|
other = other.data
|
|
|
|
if len(self.data) != len(other):
|
2007-08-30 07:37:32 +08:00
|
|
|
raise ValueError("Cannot compare vectors of different length")
|
2001-01-18 23:48:05 +08:00
|
|
|
return other
|
|
|
|
|
Merged revisions 59565-59594 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59568 | facundo.batista | 2007-12-19 13:53:01 +0100 (Wed, 19 Dec 2007) | 3 lines
Some minor cleanups. Thanks Mark Dickinson.
........
r59573 | raymond.hettinger | 2007-12-19 19:13:31 +0100 (Wed, 19 Dec 2007) | 1 line
Fix issue 1661: Flags argument silently ignored in re functions with compiled regexes.
........
r59574 | guido.van.rossum | 2007-12-19 20:41:06 +0100 (Wed, 19 Dec 2007) | 7 lines
Patch #1583 by Adam Olsen.
This adds signal.set_wakeup_fd(fd) which sets a file descriptor to
which a zero byte will be written whenever a C exception handler runs.
I added a simple C API as well, PySignal_SetWakeupFd(fd).
........
r59575 | raymond.hettinger | 2007-12-19 23:14:34 +0100 (Wed, 19 Dec 2007) | 1 line
Bigger range for non-extended opargs.
........
r59576 | guido.van.rossum | 2007-12-19 23:51:13 +0100 (Wed, 19 Dec 2007) | 5 lines
Patch #1549 by Thomas Herve.
This changes the rules for when __hash__ is inherited slightly,
by allowing it to be inherited when one or more of __lt__, __le__,
__gt__, __ge__ are overridden, as long as __eq__ and __ne__ aren't.
........
r59577 | raymond.hettinger | 2007-12-20 02:25:05 +0100 (Thu, 20 Dec 2007) | 1 line
Add comments
........
r59578 | brett.cannon | 2007-12-20 11:09:52 +0100 (Thu, 20 Dec 2007) | 3 lines
Add tests for the warnings module; specifically formatwarning and showwarning.
Still need tests for warn_explicit and simplefilter.
........
r59582 | guido.van.rossum | 2007-12-20 18:28:10 +0100 (Thu, 20 Dec 2007) | 2 lines
Patch #1672 by Joseph Armbruster. Use tempdir() to get a temporary directory.
........
r59584 | georg.brandl | 2007-12-20 22:03:02 +0100 (Thu, 20 Dec 2007) | 2 lines
Fix refleak introduced in r59576.
........
r59586 | guido.van.rossum | 2007-12-21 00:48:28 +0100 (Fri, 21 Dec 2007) | 4 lines
Improve performance of built-in any()/all() by avoiding PyIter_Next() --
using a trick found in ifilter().
Feel free to backport to 2.5.
........
r59591 | andrew.kuchling | 2007-12-22 18:27:02 +0100 (Sat, 22 Dec 2007) | 1 line
Add item
........
2007-12-24 16:52:31 +08:00
|
|
|
|
|
|
|
class SimpleOrder(object):
|
|
|
|
"""
|
|
|
|
A simple class that defines order but not full comparison.
|
|
|
|
"""
|
|
|
|
|
|
|
|
def __init__(self, value):
|
|
|
|
self.value = value
|
|
|
|
|
|
|
|
def __lt__(self, other):
|
|
|
|
if not isinstance(other, SimpleOrder):
|
|
|
|
return True
|
|
|
|
return self.value < other.value
|
|
|
|
|
|
|
|
def __gt__(self, other):
|
|
|
|
if not isinstance(other, SimpleOrder):
|
|
|
|
return False
|
|
|
|
return self.value > other.value
|
|
|
|
|
|
|
|
|
|
|
|
class DumbEqualityWithoutHash(object):
|
|
|
|
"""
|
|
|
|
A class that define __eq__, but no __hash__: it shouldn't be hashable.
|
|
|
|
"""
|
|
|
|
|
|
|
|
def __eq__(self, other):
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
2003-04-30 05:31:19 +08:00
|
|
|
opmap = {
|
|
|
|
"lt": (lambda a,b: a< b, operator.lt, operator.__lt__),
|
|
|
|
"le": (lambda a,b: a<=b, operator.le, operator.__le__),
|
|
|
|
"eq": (lambda a,b: a==b, operator.eq, operator.__eq__),
|
|
|
|
"ne": (lambda a,b: a!=b, operator.ne, operator.__ne__),
|
|
|
|
"gt": (lambda a,b: a> b, operator.gt, operator.__gt__),
|
|
|
|
"ge": (lambda a,b: a>=b, operator.ge, operator.__ge__)
|
|
|
|
}
|
|
|
|
|
|
|
|
class VectorTest(unittest.TestCase):
|
|
|
|
|
|
|
|
def checkfail(self, error, opname, *args):
|
|
|
|
for op in opmap[opname]:
|
|
|
|
self.assertRaises(error, op, *args)
|
|
|
|
|
|
|
|
def checkequal(self, opname, a, b, expres):
|
|
|
|
for op in opmap[opname]:
|
|
|
|
realres = op(a, b)
|
|
|
|
# can't use assertEqual(realres, expres) here
|
|
|
|
self.assertEqual(len(realres), len(expres))
|
2007-05-08 06:24:25 +08:00
|
|
|
for i in range(len(realres)):
|
2003-04-30 05:31:19 +08:00
|
|
|
# results are bool, so we can use "is" here
|
|
|
|
self.assert_(realres[i] is expres[i])
|
|
|
|
|
|
|
|
def test_mixed(self):
|
|
|
|
# check that comparisons involving Vector objects
|
|
|
|
# which return rich results (i.e. Vectors with itemwise
|
|
|
|
# comparison results) work
|
|
|
|
a = Vector(range(2))
|
|
|
|
b = Vector(range(3))
|
|
|
|
# all comparisons should fail for different length
|
|
|
|
for opname in opmap:
|
|
|
|
self.checkfail(ValueError, opname, a, b)
|
|
|
|
|
2007-05-08 06:24:25 +08:00
|
|
|
a = list(range(5))
|
2003-04-30 05:31:19 +08:00
|
|
|
b = 5 * [2]
|
|
|
|
# try mixed arguments (but not (a, b) as that won't return a bool vector)
|
|
|
|
args = [(a, Vector(b)), (Vector(a), b), (Vector(a), Vector(b))]
|
|
|
|
for (a, b) in args:
|
|
|
|
self.checkequal("lt", a, b, [True, True, False, False, False])
|
|
|
|
self.checkequal("le", a, b, [True, True, True, False, False])
|
|
|
|
self.checkequal("eq", a, b, [False, False, True, False, False])
|
|
|
|
self.checkequal("ne", a, b, [True, True, False, True, True ])
|
|
|
|
self.checkequal("gt", a, b, [False, False, False, True, True ])
|
|
|
|
self.checkequal("ge", a, b, [False, False, True, True, True ])
|
|
|
|
|
2007-02-11 14:12:03 +08:00
|
|
|
for ops in opmap.values():
|
2003-04-30 05:31:19 +08:00
|
|
|
for op in ops:
|
2006-11-29 03:15:13 +08:00
|
|
|
# calls __bool__, which should fail
|
2003-04-30 05:31:19 +08:00
|
|
|
self.assertRaises(TypeError, bool, op(a, b))
|
|
|
|
|
|
|
|
class NumberTest(unittest.TestCase):
|
|
|
|
|
|
|
|
def test_basic(self):
|
|
|
|
# Check that comparisons involving Number objects
|
|
|
|
# give the same results give as comparing the
|
|
|
|
# corresponding ints
|
2007-05-08 06:24:25 +08:00
|
|
|
for a in range(3):
|
|
|
|
for b in range(3):
|
2003-04-30 05:31:19 +08:00
|
|
|
for typea in (int, Number):
|
|
|
|
for typeb in (int, Number):
|
|
|
|
if typea==typeb==int:
|
|
|
|
continue # the combination int, int is useless
|
|
|
|
ta = typea(a)
|
|
|
|
tb = typeb(b)
|
2007-02-11 14:12:03 +08:00
|
|
|
for ops in opmap.values():
|
2003-04-30 05:31:19 +08:00
|
|
|
for op in ops:
|
|
|
|
realoutcome = op(a, b)
|
|
|
|
testoutcome = op(ta, tb)
|
|
|
|
self.assertEqual(realoutcome, testoutcome)
|
|
|
|
|
|
|
|
def checkvalue(self, opname, a, b, expres):
|
|
|
|
for typea in (int, Number):
|
|
|
|
for typeb in (int, Number):
|
|
|
|
ta = typea(a)
|
|
|
|
tb = typeb(b)
|
|
|
|
for op in opmap[opname]:
|
|
|
|
realres = op(ta, tb)
|
|
|
|
realres = getattr(realres, "x", realres)
|
|
|
|
self.assert_(realres is expres)
|
|
|
|
|
|
|
|
def test_values(self):
|
|
|
|
# check all operators and all comparison results
|
|
|
|
self.checkvalue("lt", 0, 0, False)
|
|
|
|
self.checkvalue("le", 0, 0, True )
|
|
|
|
self.checkvalue("eq", 0, 0, True )
|
|
|
|
self.checkvalue("ne", 0, 0, False)
|
|
|
|
self.checkvalue("gt", 0, 0, False)
|
|
|
|
self.checkvalue("ge", 0, 0, True )
|
|
|
|
|
|
|
|
self.checkvalue("lt", 0, 1, True )
|
|
|
|
self.checkvalue("le", 0, 1, True )
|
|
|
|
self.checkvalue("eq", 0, 1, False)
|
|
|
|
self.checkvalue("ne", 0, 1, True )
|
|
|
|
self.checkvalue("gt", 0, 1, False)
|
|
|
|
self.checkvalue("ge", 0, 1, False)
|
|
|
|
|
|
|
|
self.checkvalue("lt", 1, 0, False)
|
|
|
|
self.checkvalue("le", 1, 0, False)
|
|
|
|
self.checkvalue("eq", 1, 0, False)
|
|
|
|
self.checkvalue("ne", 1, 0, True )
|
|
|
|
self.checkvalue("gt", 1, 0, True )
|
|
|
|
self.checkvalue("ge", 1, 0, True )
|
|
|
|
|
|
|
|
class MiscTest(unittest.TestCase):
|
|
|
|
|
|
|
|
def test_misbehavin(self):
|
|
|
|
class Misb:
|
|
|
|
def __lt__(self, other): return 0
|
|
|
|
def __gt__(self, other): return 0
|
|
|
|
def __eq__(self, other): return 0
|
2007-08-30 07:37:32 +08:00
|
|
|
def __le__(self, other): raise TestFailed("This shouldn't happen")
|
|
|
|
def __ge__(self, other): raise TestFailed("This shouldn't happen")
|
|
|
|
def __ne__(self, other): raise TestFailed("This shouldn't happen")
|
|
|
|
def __cmp__(self, other): raise RuntimeError("expected")
|
2003-04-30 05:31:19 +08:00
|
|
|
a = Misb()
|
|
|
|
b = Misb()
|
|
|
|
self.assertEqual(a<b, 0)
|
|
|
|
self.assertEqual(a==b, 0)
|
|
|
|
self.assertEqual(a>b, 0)
|
|
|
|
self.assertRaises(RuntimeError, cmp, a, b)
|
|
|
|
|
|
|
|
def test_not(self):
|
2006-11-29 03:15:13 +08:00
|
|
|
# Check that exceptions in __bool__ are properly
|
2003-04-30 05:31:19 +08:00
|
|
|
# propagated by the not operator
|
|
|
|
import operator
|
2006-03-24 15:02:16 +08:00
|
|
|
class Exc(Exception):
|
2001-01-18 23:48:05 +08:00
|
|
|
pass
|
2003-04-30 05:31:19 +08:00
|
|
|
class Bad:
|
2006-11-29 03:15:13 +08:00
|
|
|
def __bool__(self):
|
2003-04-30 05:31:19 +08:00
|
|
|
raise Exc
|
|
|
|
|
|
|
|
def do(bad):
|
|
|
|
not bad
|
|
|
|
|
|
|
|
for func in (do, operator.not_):
|
|
|
|
self.assertRaises(Exc, func, Bad())
|
|
|
|
|
|
|
|
def test_recursion(self):
|
2003-10-28 20:05:48 +08:00
|
|
|
# Check that comparison for recursive objects fails gracefully
|
2008-02-13 04:03:09 +08:00
|
|
|
from collections import UserList
|
2003-04-30 05:31:19 +08:00
|
|
|
a = UserList()
|
|
|
|
b = UserList()
|
|
|
|
a.append(b)
|
|
|
|
b.append(a)
|
2003-10-28 20:05:48 +08:00
|
|
|
self.assertRaises(RuntimeError, operator.eq, a, b)
|
|
|
|
self.assertRaises(RuntimeError, operator.ne, a, b)
|
|
|
|
self.assertRaises(RuntimeError, operator.lt, a, b)
|
|
|
|
self.assertRaises(RuntimeError, operator.le, a, b)
|
|
|
|
self.assertRaises(RuntimeError, operator.gt, a, b)
|
|
|
|
self.assertRaises(RuntimeError, operator.ge, a, b)
|
2003-04-30 05:31:19 +08:00
|
|
|
|
|
|
|
b.append(17)
|
2003-10-28 20:05:48 +08:00
|
|
|
# Even recursive lists of different lengths are different,
|
|
|
|
# but they cannot be ordered
|
|
|
|
self.assert_(not (a == b))
|
2003-04-30 05:31:19 +08:00
|
|
|
self.assert_(a != b)
|
2003-10-28 20:05:48 +08:00
|
|
|
self.assertRaises(RuntimeError, operator.lt, a, b)
|
|
|
|
self.assertRaises(RuntimeError, operator.le, a, b)
|
|
|
|
self.assertRaises(RuntimeError, operator.gt, a, b)
|
|
|
|
self.assertRaises(RuntimeError, operator.ge, a, b)
|
2003-04-30 05:31:19 +08:00
|
|
|
a.append(17)
|
2003-10-28 20:05:48 +08:00
|
|
|
self.assertRaises(RuntimeError, operator.eq, a, b)
|
|
|
|
self.assertRaises(RuntimeError, operator.ne, a, b)
|
|
|
|
a.insert(0, 11)
|
|
|
|
b.insert(0, 12)
|
|
|
|
self.assert_(not (a == b))
|
|
|
|
self.assert_(a != b)
|
|
|
|
self.assert_(a < b)
|
2003-04-30 05:31:19 +08:00
|
|
|
|
|
|
|
class DictTest(unittest.TestCase):
|
|
|
|
|
|
|
|
def test_dicts(self):
|
|
|
|
# Verify that __eq__ and __ne__ work for dicts even if the keys and
|
2005-08-24 17:08:57 +08:00
|
|
|
# values don't support anything other than __eq__ and __ne__ (and
|
|
|
|
# __hash__). Complex numbers are a fine example of that.
|
2003-04-30 05:31:19 +08:00
|
|
|
import random
|
|
|
|
imag1a = {}
|
|
|
|
for i in range(50):
|
|
|
|
imag1a[random.randrange(100)*1j] = random.randrange(100)*1j
|
2007-02-15 12:01:01 +08:00
|
|
|
items = list(imag1a.items())
|
2003-04-30 05:31:19 +08:00
|
|
|
random.shuffle(items)
|
|
|
|
imag1b = {}
|
|
|
|
for k, v in items:
|
|
|
|
imag1b[k] = v
|
|
|
|
imag2 = imag1b.copy()
|
|
|
|
imag2[k] = v + 1.0
|
2007-07-11 20:20:59 +08:00
|
|
|
self.assertEqual(imag1a, imag1a)
|
|
|
|
self.assertEqual(imag1a, imag1b)
|
|
|
|
self.assertEqual(imag2, imag2)
|
2003-04-30 05:31:19 +08:00
|
|
|
self.assert_(imag1a != imag2)
|
|
|
|
for opname in ("lt", "le", "gt", "ge"):
|
|
|
|
for op in opmap[opname]:
|
|
|
|
self.assertRaises(TypeError, op, imag1a, imag2)
|
|
|
|
|
|
|
|
class ListTest(unittest.TestCase):
|
|
|
|
|
|
|
|
def assertIs(self, a, b):
|
|
|
|
self.assert_(a is b)
|
|
|
|
|
|
|
|
def test_coverage(self):
|
|
|
|
# exercise all comparisons for lists
|
|
|
|
x = [42]
|
|
|
|
self.assertIs(x<x, False)
|
|
|
|
self.assertIs(x<=x, True)
|
|
|
|
self.assertIs(x==x, True)
|
|
|
|
self.assertIs(x!=x, False)
|
|
|
|
self.assertIs(x>x, False)
|
|
|
|
self.assertIs(x>=x, True)
|
|
|
|
y = [42, 42]
|
|
|
|
self.assertIs(x<y, True)
|
|
|
|
self.assertIs(x<=y, True)
|
|
|
|
self.assertIs(x==y, False)
|
|
|
|
self.assertIs(x!=y, True)
|
|
|
|
self.assertIs(x>y, False)
|
|
|
|
self.assertIs(x>=y, False)
|
|
|
|
|
|
|
|
def test_badentry(self):
|
|
|
|
# make sure that exceptions for item comparison are properly
|
|
|
|
# propagated in list comparisons
|
2006-03-24 15:02:16 +08:00
|
|
|
class Exc(Exception):
|
2001-01-18 23:48:05 +08:00
|
|
|
pass
|
2003-04-30 05:31:19 +08:00
|
|
|
class Bad:
|
|
|
|
def __eq__(self, other):
|
|
|
|
raise Exc
|
2001-01-18 23:48:05 +08:00
|
|
|
|
2003-04-30 05:31:19 +08:00
|
|
|
x = [Bad()]
|
|
|
|
y = [Bad()]
|
|
|
|
|
|
|
|
for op in opmap["eq"]:
|
|
|
|
self.assertRaises(Exc, op, x, y)
|
|
|
|
|
|
|
|
def test_goodentry(self):
|
|
|
|
# This test exercises the final call to PyObject_RichCompare()
|
|
|
|
# in Objects/listobject.c::list_richcompare()
|
|
|
|
class Good:
|
|
|
|
def __lt__(self, other):
|
|
|
|
return True
|
|
|
|
|
|
|
|
x = [Good()]
|
|
|
|
y = [Good()]
|
|
|
|
|
|
|
|
for op in opmap["lt"]:
|
|
|
|
self.assertIs(op(x, y), True)
|
|
|
|
|
Merged revisions 59565-59594 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59568 | facundo.batista | 2007-12-19 13:53:01 +0100 (Wed, 19 Dec 2007) | 3 lines
Some minor cleanups. Thanks Mark Dickinson.
........
r59573 | raymond.hettinger | 2007-12-19 19:13:31 +0100 (Wed, 19 Dec 2007) | 1 line
Fix issue 1661: Flags argument silently ignored in re functions with compiled regexes.
........
r59574 | guido.van.rossum | 2007-12-19 20:41:06 +0100 (Wed, 19 Dec 2007) | 7 lines
Patch #1583 by Adam Olsen.
This adds signal.set_wakeup_fd(fd) which sets a file descriptor to
which a zero byte will be written whenever a C exception handler runs.
I added a simple C API as well, PySignal_SetWakeupFd(fd).
........
r59575 | raymond.hettinger | 2007-12-19 23:14:34 +0100 (Wed, 19 Dec 2007) | 1 line
Bigger range for non-extended opargs.
........
r59576 | guido.van.rossum | 2007-12-19 23:51:13 +0100 (Wed, 19 Dec 2007) | 5 lines
Patch #1549 by Thomas Herve.
This changes the rules for when __hash__ is inherited slightly,
by allowing it to be inherited when one or more of __lt__, __le__,
__gt__, __ge__ are overridden, as long as __eq__ and __ne__ aren't.
........
r59577 | raymond.hettinger | 2007-12-20 02:25:05 +0100 (Thu, 20 Dec 2007) | 1 line
Add comments
........
r59578 | brett.cannon | 2007-12-20 11:09:52 +0100 (Thu, 20 Dec 2007) | 3 lines
Add tests for the warnings module; specifically formatwarning and showwarning.
Still need tests for warn_explicit and simplefilter.
........
r59582 | guido.van.rossum | 2007-12-20 18:28:10 +0100 (Thu, 20 Dec 2007) | 2 lines
Patch #1672 by Joseph Armbruster. Use tempdir() to get a temporary directory.
........
r59584 | georg.brandl | 2007-12-20 22:03:02 +0100 (Thu, 20 Dec 2007) | 2 lines
Fix refleak introduced in r59576.
........
r59586 | guido.van.rossum | 2007-12-21 00:48:28 +0100 (Fri, 21 Dec 2007) | 4 lines
Improve performance of built-in any()/all() by avoiding PyIter_Next() --
using a trick found in ifilter().
Feel free to backport to 2.5.
........
r59591 | andrew.kuchling | 2007-12-22 18:27:02 +0100 (Sat, 22 Dec 2007) | 1 line
Add item
........
2007-12-24 16:52:31 +08:00
|
|
|
|
|
|
|
class HashableTest(unittest.TestCase):
|
|
|
|
"""
|
|
|
|
Test hashability of classes with rich operators defined.
|
|
|
|
"""
|
|
|
|
|
|
|
|
def test_simpleOrderHashable(self):
|
|
|
|
"""
|
|
|
|
A class that only defines __gt__ and/or __lt__ should be hashable.
|
|
|
|
"""
|
|
|
|
a = SimpleOrder(1)
|
|
|
|
b = SimpleOrder(2)
|
|
|
|
self.assert_(a < b)
|
|
|
|
self.assert_(b > a)
|
|
|
|
self.assert_(a.__hash__ is not None)
|
|
|
|
|
|
|
|
def test_notHashableException(self):
|
|
|
|
"""
|
|
|
|
If a class is not hashable, it should raise a TypeError with an
|
|
|
|
understandable message.
|
|
|
|
"""
|
|
|
|
a = DumbEqualityWithoutHash()
|
|
|
|
try:
|
|
|
|
hash(a)
|
|
|
|
except TypeError as e:
|
|
|
|
self.assertEquals(str(e),
|
|
|
|
"unhashable type: 'DumbEqualityWithoutHash'")
|
|
|
|
else:
|
|
|
|
raise test_support.TestFailed("Should not be here")
|
|
|
|
|
|
|
|
|
2003-04-30 05:31:19 +08:00
|
|
|
def test_main():
|
Merged revisions 59565-59594 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59568 | facundo.batista | 2007-12-19 13:53:01 +0100 (Wed, 19 Dec 2007) | 3 lines
Some minor cleanups. Thanks Mark Dickinson.
........
r59573 | raymond.hettinger | 2007-12-19 19:13:31 +0100 (Wed, 19 Dec 2007) | 1 line
Fix issue 1661: Flags argument silently ignored in re functions with compiled regexes.
........
r59574 | guido.van.rossum | 2007-12-19 20:41:06 +0100 (Wed, 19 Dec 2007) | 7 lines
Patch #1583 by Adam Olsen.
This adds signal.set_wakeup_fd(fd) which sets a file descriptor to
which a zero byte will be written whenever a C exception handler runs.
I added a simple C API as well, PySignal_SetWakeupFd(fd).
........
r59575 | raymond.hettinger | 2007-12-19 23:14:34 +0100 (Wed, 19 Dec 2007) | 1 line
Bigger range for non-extended opargs.
........
r59576 | guido.van.rossum | 2007-12-19 23:51:13 +0100 (Wed, 19 Dec 2007) | 5 lines
Patch #1549 by Thomas Herve.
This changes the rules for when __hash__ is inherited slightly,
by allowing it to be inherited when one or more of __lt__, __le__,
__gt__, __ge__ are overridden, as long as __eq__ and __ne__ aren't.
........
r59577 | raymond.hettinger | 2007-12-20 02:25:05 +0100 (Thu, 20 Dec 2007) | 1 line
Add comments
........
r59578 | brett.cannon | 2007-12-20 11:09:52 +0100 (Thu, 20 Dec 2007) | 3 lines
Add tests for the warnings module; specifically formatwarning and showwarning.
Still need tests for warn_explicit and simplefilter.
........
r59582 | guido.van.rossum | 2007-12-20 18:28:10 +0100 (Thu, 20 Dec 2007) | 2 lines
Patch #1672 by Joseph Armbruster. Use tempdir() to get a temporary directory.
........
r59584 | georg.brandl | 2007-12-20 22:03:02 +0100 (Thu, 20 Dec 2007) | 2 lines
Fix refleak introduced in r59576.
........
r59586 | guido.van.rossum | 2007-12-21 00:48:28 +0100 (Fri, 21 Dec 2007) | 4 lines
Improve performance of built-in any()/all() by avoiding PyIter_Next() --
using a trick found in ifilter().
Feel free to backport to 2.5.
........
r59591 | andrew.kuchling | 2007-12-22 18:27:02 +0100 (Sat, 22 Dec 2007) | 1 line
Add item
........
2007-12-24 16:52:31 +08:00
|
|
|
test_support.run_unittest(VectorTest, NumberTest, MiscTest, DictTest, ListTest, HashableTest)
|
2003-04-30 05:31:19 +08:00
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
|
|
test_main()
|