Mailman 3 September 2004 - Python-checkins

python/dist/src/Lib/test test_heapq.py,1.14,1.15
by rhettinger＠users.sourceforge.net Sept. 28, 2004

Sept. 28, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16444/Lib/test Modified Files: test_heapq.py Log Message: Plug a leak and beef-up test coverage. Index: test_heapq.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_heapq.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- test_heapq.py 8 Jul 2004 04:22:19 -0000 1.14 +++ test_heapq.py 28 Sep 2004 00:03:54 -0000 1.15 @@ -110,8 +110,157 @@ for n in (0, 1, 2, 10, 100, 400, 999, 1000, 1100): self.assertEqual(nlargest(n, data), sorted(data, reverse=True)[:n]) + +#============================================================================== + +class LenOnly: + "Dummy sequence class defining __len__ but not __getitem__." + def __len__(self): + return 10 + +class GetOnly: + "Dummy sequence class defining __getitem__ but not __len__." + def __getitem__(self, ndx): + return 10 + +class CmpErr: + "Dummy element that always raises an error during comparison" + def __cmp__(self, other): + raise ZeroDivisionError + +def R(seqn): + 'Regular generator' + for i in seqn: + yield i + +class G: + 'Sequence using __getitem__' + def __init__(self, seqn): + self.seqn = seqn + def __getitem__(self, i): + return self.seqn[i] + +class I: + 'Sequence using iterator protocol' + def __init__(self, seqn): + self.seqn = seqn + self.i = 0 + def __iter__(self): + return self + def next(self): + if self.i >= len(self.seqn): raise StopIteration + v = self.seqn[self.i] + self.i += 1 + return v + +class Ig: + 'Sequence using iterator protocol defined with a generator' + def __init__(self, seqn): + self.seqn = seqn + self.i = 0 + def __iter__(self): + for val in self.seqn: + yield val + +class X: + 'Missing __getitem__ and __iter__' + def __init__(self, seqn): + self.seqn = seqn + self.i = 0 + def next(self): + if self.i >= len(self.seqn): raise StopIteration + v = self.seqn[self.i] + self.i += 1 + return v + +class N: + 'Iterator missing next()' + def __init__(self, seqn): + self.seqn = seqn + self.i = 0 + def __iter__(self): + return self + +class E: + 'Test propagation of exceptions' + def __init__(self, seqn): + self.seqn = seqn + self.i = 0 + def __iter__(self): + return self + def next(self): + 3 // 0 + +class S: + 'Test immediate stop' + def __init__(self, seqn): + pass + def __iter__(self): + return self + def next(self): + raise StopIteration + +from itertools import chain, imap +def L(seqn): + 'Test multiple tiers of iterators' + return chain(imap(lambda x:x, R(Ig(G(seqn))))) + +class TestErrorHandling(unittest.TestCase): + + def test_non_sequence(self): + for f in (heapify, heappop): + self.assertRaises(TypeError, f, 10) + for f in (heappush, heapreplace, nlargest, nsmallest): + self.assertRaises(TypeError, f, 10, 10) + + def test_len_only(self): + for f in (heapify, heappop): + self.assertRaises(TypeError, f, LenOnly()) + for f in (heappush, heapreplace): + self.assertRaises(TypeError, f, LenOnly(), 10) + for f in (nlargest, nsmallest): + self.assertRaises(TypeError, f, 2, LenOnly()) + + def test_get_only(self): + for f in (heapify, heappop): + self.assertRaises(TypeError, f, GetOnly()) + for f in (heappush, heapreplace): + self.assertRaises(TypeError, f, GetOnly(), 10) + for f in (nlargest, nsmallest): + self.assertRaises(TypeError, f, 2, GetOnly()) + + def test_get_only(self): + seq = [CmpErr(), CmpErr(), CmpErr()] + for f in (heapify, heappop): + self.assertRaises(ZeroDivisionError, f, seq) + for f in (heappush, heapreplace): + self.assertRaises(ZeroDivisionError, f, seq, 10) + for f in (nlargest, nsmallest): + self.assertRaises(ZeroDivisionError, f, 2, seq) + + def test_arg_parsing(self): + for f in (heapify, heappop, heappush, heapreplace, nlargest, nsmallest): + self.assertRaises(TypeError, f, 10) + + def test_iterable_args(self): + for f in (nlargest, nsmallest): + for s in ("123", "", range(1000), ('do', 1.2), xrange(2000,2200,5)): + for g in (G, I, Ig, L, R): + self.assertEqual(f(2, g(s)), f(2,s)) + self.assertEqual(f(2, S(s)), []) + self.assertRaises(TypeError, f, 2, X(s)) + self.assertRaises(TypeError, f, 2, N(s)) + self.assertRaises(ZeroDivisionError, f, 2, E(s)) + +#============================================================================== + + def test_main(verbose=None): + from types import BuiltinFunctionType + test_classes = [TestHeap] + if isinstance(heapify, BuiltinFunctionType): + test_classes.append(TestErrorHandling) test_support.run_unittest(*test_classes) # verify reference counting

1 0

python/dist/src/Lib/test test_bisect.py, 1.12, 1.13
by rhettinger＠users.sourceforge.net Sept. 27, 2004

Sept. 27, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4584 Modified Files: test_bisect.py Log Message: Rename test for comparision errors. Index: test_bisect.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_bisect.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- test_bisect.py 27 Sep 2004 22:48:40 -0000 1.12 +++ test_bisect.py 27 Sep 2004 23:11:35 -0000 1.13 @@ -181,7 +181,7 @@ for f in (bisect_left, bisect_right, insort_left, insort_right): self.assertRaises(AttributeError, f, GetOnly(), 10) - def test_get_only(self): + def test_cmp_err(self): seq = [CmpErr(), CmpErr(), CmpErr()] for f in (bisect_left, bisect_right, insort_left, insort_right): self.assertRaises(ZeroDivisionError, f, seq, 10)

1 0

python/dist/src/Lib/test test_bisect.py, 1.11, 1.12
by rhettinger＠users.sourceforge.net Sept. 27, 2004

Sept. 27, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31537 Modified Files: test_bisect.py Log Message: Beef-up tests for greater coverage and refcount checking. Index: test_bisect.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_bisect.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- test_bisect.py 29 Jan 2004 06:37:49 -0000 1.11 +++ test_bisect.py 27 Sep 2004 22:48:40 -0000 1.12 @@ -151,6 +151,47 @@ #============================================================================== + +class LenOnly: + "Dummy sequence class defining __len__ but not __getitem__." + def __len__(self): + return 10 + +class GetOnly: + "Dummy sequence class defining __getitem__ but not __len__." + def __getitem__(self, ndx): + return 10 + +class CmpErr: + "Dummy element that always raises an error during comparison" + def __cmp__(self, other): + raise ZeroDivisionError + +class TestErrorHandling(unittest.TestCase): + + def test_non_sequence(self): + for f in (bisect_left, bisect_right, insort_left, insort_right): + self.assertRaises(TypeError, f, 10, 10) + + def test_len_only(self): + for f in (bisect_left, bisect_right, insort_left, insort_right): + self.assertRaises(AttributeError, f, LenOnly(), 10) + + def test_get_only(self): + for f in (bisect_left, bisect_right, insort_left, insort_right): + self.assertRaises(AttributeError, f, GetOnly(), 10) + + def test_get_only(self): + seq = [CmpErr(), CmpErr(), CmpErr()] + for f in (bisect_left, bisect_right, insort_left, insort_right): + self.assertRaises(ZeroDivisionError, f, seq, 10) + + def test_arg_parsing(self): + for f in (bisect_left, bisect_right, insort_left, insort_right): + self.assertRaises(TypeError, f, 10) + +#============================================================================== + libreftest = """ Example from the Library Reference: Doc/lib/libbisect.tex @@ -178,8 +219,25 @@ def test_main(verbose=None): from test import test_bisect - test_support.run_unittest(TestBisect, TestInsort) + from types import BuiltinFunctionType + import sys + + test_classes = [TestBisect, TestInsort] + if isinstance(bisect_left, BuiltinFunctionType): + test_classes.append(TestErrorHandling) + + test_support.run_unittest(*test_classes) test_support.run_doctest(test_bisect, verbose) + # verify reference counting + if verbose and hasattr(sys, "gettotalrefcount"): + import gc + counts = [None] * 5 + for i in xrange(len(counts)): + test_support.run_unittest(*test_classes) + gc.collect() + counts[i] = sys.gettotalrefcount() + print counts + if __name__ == "__main__": test_main(verbose=True)

1 0

python/dist/src/Modules posixmodule.c, 2.326, 2.327
by arigo＠users.sourceforge.net Sept. 27, 2004

Sept. 27, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27542/Modules Modified Files: posixmodule.c Log Message: Patch #1009075, bug #952953: allow execve with empty 2nd argument Index: posixmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/posixmodule.c,v retrieving revision 2.326 retrieving revision 2.327 diff -u -d -r2.326 -r2.327 --- posixmodule.c 30 Aug 2004 17:36:46 -0000 2.326 +++ posixmodule.c 27 Sep 2004 19:54:33 -0000 2.327 @@ -2171,12 +2171,6 @@ return NULL; } - if (argc == 0) { - PyErr_SetString(PyExc_ValueError, "execv() arg 2 must not be empty"); - PyMem_Free(path); - return NULL; - } - argvlist = PyMem_NEW(char *, argc+1); if (argvlist == NULL) { PyMem_Free(path); @@ -2253,12 +2247,6 @@ goto fail_0; } - if (argc == 0) { - PyErr_SetString(PyExc_ValueError, - "execve() arg 2 must not be empty"); - goto fail_0; - } - argvlist = PyMem_NEW(char *, argc+1); if (argvlist == NULL) { PyErr_NoMemory();

1 0

python/dist/src/Doc/lib libos.tex,1.141,1.142
by arigo＠users.sourceforge.net Sept. 27, 2004

Sept. 27, 2004

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27542/Doc/lib Modified Files: libos.tex Log Message: Patch #1009075, bug #952953: allow execve with empty 2nd argument Index: libos.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/libos.tex,v retrieving revision 1.141 retrieving revision 1.142 diff -u -d -r1.141 -r1.142 --- libos.tex 29 Aug 2004 15:46:20 -0000 1.141 +++ libos.tex 27 Sep 2004 19:54:32 -0000 1.142 @@ -1226,8 +1226,8 @@ \function{execl*()} functions. The \character{v} variants are good when the number of parameters is variable, with the arguments being passed in a list or tuple as the \var{args} parameter. In either -case, the arguments to the child process must start with the name of -the command being run. +case, the arguments to the child process should start with the name of +the command being run, but this is not enforced. The variants which include a \character{p} near the end (\function{execlp()}, \function{execlpe()}, \function{execvp()},

1 0

python/dist/src/Lib/test test_struct.py, 1.18, 1.19
by arigo＠users.sourceforge.net Sept. 27, 2004

Sept. 27, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22138/Lib/test Modified Files: test_struct.py Log Message: Patch #1011240: SystemError generated by struct.pack('P', 'foo'). Index: test_struct.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_struct.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- test_struct.py 12 Feb 2004 17:35:11 -0000 1.18 +++ test_struct.py 27 Sep 2004 19:27:50 -0000 1.19 @@ -54,6 +54,7 @@ simple_err(struct.pack, 'iii', 3) simple_err(struct.pack, 'i', 3, 3, 3) simple_err(struct.pack, 'i', 'foo') +simple_err(struct.pack, 'P', 'foo') simple_err(struct.unpack, 'd', 'flap') s = struct.pack('ii', 1, 2) simple_err(struct.unpack, 'iii', s)

1 0

python/dist/src/Modules structmodule.c,2.61,2.62
by arigo＠users.sourceforge.net Sept. 27, 2004

Sept. 27, 2004

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22138/Modules Modified Files: structmodule.c Log Message: Patch #1011240: SystemError generated by struct.pack('P', 'foo'). Index: structmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/structmodule.c,v retrieving revision 2.61 retrieving revision 2.62 diff -u -d -r2.61 -r2.62 --- structmodule.c 19 Nov 2003 22:52:23 -0000 2.61 +++ structmodule.c 27 Sep 2004 19:27:51 -0000 2.62 @@ -518,14 +518,16 @@ static int np_void_p(char *p, PyObject *v, const formatdef *f) { - void *x = PyLong_AsVoidPtr(v); - if (x == NULL && PyErr_Occurred()) { - /* ### hrm. PyLong_AsVoidPtr raises SystemError */ - if (PyErr_ExceptionMatches(PyExc_TypeError)) - PyErr_SetString(StructError, - "required argument is not an integer"); + void *x; + + v = get_pylong(v); + if (v == NULL) + return -1; + assert(PyLong_Check(v)); + x = PyLong_AsVoidPtr(v); + Py_DECREF(v); + if (x == NULL && PyErr_Occurred()) return -1; - } memcpy(p, (char *)&x, sizeof x); return 0; }

1 0

python/dist/src/Lib asynchat.py,1.24,1.25
by arigo＠users.sourceforge.net Sept. 27, 2004

Sept. 27, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1673 Modified Files: asynchat.py Log Message: Trivial bug fix: deque == [] is not a good way to check if a deque is empty. Index: asynchat.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/asynchat.py,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- asynchat.py 1 Mar 2004 23:16:22 -0000 1.24 +++ asynchat.py 27 Sep 2004 17:49:00 -0000 1.25 @@ -259,7 +259,7 @@ return len(self.list) def is_empty (self): - return self.list == [] + return not self.list def first (self): return self.list[0]

1 0

python/dist/src/Lib/test test_deque.py, 1.14, 1.15 test_enumerate.py, 1.12, 1.13 test_itertools.py, 1.32, 1.33 test_random.py, 1.21, 1.22 test_set.py, 1.13, 1.14
by rhettinger＠users.sourceforge.net Sept. 27, 2004

Sept. 27, 2004

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29983/test Modified Files: test_deque.py test_enumerate.py test_itertools.py test_random.py test_set.py Log Message: Use floor division operator. Index: test_deque.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_deque.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- test_deque.py 26 Aug 2004 04:29:47 -0000 1.14 +++ test_deque.py 27 Sep 2004 15:29:04 -0000 1.15 @@ -385,7 +385,7 @@ def __iter__(self): return self def next(self): - 3/0 + 3 // 0 class S: 'Test immediate stop' Index: test_enumerate.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_enumerate.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- test_enumerate.py 10 Mar 2004 10:10:42 -0000 1.12 +++ test_enumerate.py 27 Sep 2004 15:29:04 -0000 1.13 @@ -50,7 +50,7 @@ def __iter__(self): return self def next(self): - 3/0 + 3 // 0 class N: 'Iterator missing next()' Index: test_itertools.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_itertools.py,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- test_itertools.py 23 Sep 2004 07:27:39 -0000 1.32 +++ test_itertools.py 27 Sep 2004 15:29:04 -0000 1.33 @@ -476,7 +476,7 @@ def __iter__(self): return self def next(self): - 3/0 + 3 // 0 class S: 'Test immediate stop' Index: test_random.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_random.py,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- test_random.py 13 Sep 2004 22:23:20 -0000 1.21 +++ test_random.py 27 Sep 2004 15:29:05 -0000 1.22 @@ -79,7 +79,7 @@ def factorial(n): return reduce(int.__mul__, xrange(1, n), 1) for k in xrange(n): - expected = factorial(n) / factorial(n-k) + expected = factorial(n) // factorial(n-k) perms = {} for i in xrange(trials): perms[tuple(self.gen.sample(pop, k))] = None Index: test_set.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_set.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- test_set.py 9 Jul 2004 04:51:24 -0000 1.13 +++ test_set.py 27 Sep 2004 15:29:05 -0000 1.14 @@ -1241,7 +1241,7 @@ def __iter__(self): return self def next(self): - 3/0 + 3 // 0 class S: 'Test immediate stop'

1 0

python/dist/src/Lib imaplib.py, 1.72, 1.73 random.py, 1.68, 1.69
by rhettinger＠users.sourceforge.net Sept. 27, 2004

Sept. 27, 2004

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29983 Modified Files: imaplib.py random.py Log Message: Use floor division operator. Index: imaplib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/imaplib.py,v retrieving revision 1.72 retrieving revision 1.73 diff -u -d -r1.72 -r1.73 --- imaplib.py 10 Aug 2004 01:24:54 -0000 1.72 +++ imaplib.py 27 Sep 2004 15:29:02 -0000 1.73 @@ -1361,7 +1361,7 @@ zone = -time.altzone else: zone = -time.timezone - return '"' + dt + " %+03d%02d" % divmod(zone/60, 60) + '"' + return '"' + dt + " %+03d%02d" % divmod(zone//60, 60) + '"' Index: random.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/random.py,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- random.py 13 Sep 2004 22:23:20 -0000 1.68 +++ random.py 27 Sep 2004 15:29:03 -0000 1.69 @@ -197,9 +197,9 @@ if istep != step: raise ValueError, "non-integer step for randrange()" if istep > 0: - n = (width + istep - 1) / istep + n = (width + istep - 1) // istep elif istep < 0: - n = (width + istep + 1) / istep + n = (width + istep + 1) // istep else: raise ValueError, "zero step for randrange()"

1 0