Mailman 3 October 2003 - Python-checkins

[Python-checkins] distutils README.txt, 1.26, 1.27 CHANGES.txt, 1.22, 1.23
by akuchling＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/distutils In directory sc8-pr-cvs1:/tmp/cvs-serv32295 Modified Files: README.txt CHANGES.txt Log Message: Add entry for impending 1.1 release Index: README.txt =================================================================== RCS file: /cvsroot/python/distutils/README.txt,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** README.txt 19 Nov 2002 14:26:18 -0000 1.26 --- README.txt 24 Oct 2003 18:23:09 -0000 1.27 *************** *** 1,5 **** Python Distribution Utilities ! release 1.0.3 ! November 24th, 2002 --- 1,5 ---- Python Distribution Utilities ! release 1.1 ! October XXXth, 2003 Index: CHANGES.txt =================================================================== RCS file: /cvsroot/python/distutils/CHANGES.txt,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** CHANGES.txt 19 Nov 2002 14:22:54 -0000 1.22 --- CHANGES.txt 24 Oct 2003 18:23:09 -0000 1.23 *************** *** 1,2 **** --- 1,9 ---- + Relase 1.1 (XXX October, 2003): + ------------------------------- + + Release 1.1 of Distutils is the version of the Distutils included with + Python 2.3.2, plus a few docstring typo fixes. + + Relase 1.0.3 (24 November, 2002): ---------------------------------

1 0

distutils MINIFEST.in,1.2,1.3
by akuchling＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/distutils In directory sc8-pr-cvs1:/tmp/cvs-serv32119 Modified Files: MINIFEST.in Log Message: Include docs in snapshots Index: MINIFEST.in =================================================================== RCS file: /cvsroot/python/distutils/MINIFEST.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MINIFEST.in 28 Jun 2000 01:31:37 -0000 1.2 --- MINIFEST.in 24 Oct 2003 18:22:24 -0000 1.3 *************** *** 1,4 **** # ! # mini-manifest used to create code snapshots: no docs, no examples, # just the code (should include tests at some point, but they're # either non-existent or hopelessly crude right now) --- 1,4 ---- # ! # mini-manifest used to create code snapshots: no examples, # just the code (should include tests at some point, but they're # either non-existent or hopelessly crude right now) *************** *** 7,11 **** # include README.snapshot - exclude *.txt recursive-include examples *.txt *.py prune examples/sample*/build --- 7,10 ----

1 0

python/dist/src/Lib tarfile.py,1.8,1.8.12.1
by akuchling＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv25149 Modified Files: Tag: release23-maint tarfile.py Log Message: [Backport fix for bug #822668] gzip filesize should be written out mod 2**32 Index: tarfile.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/tarfile.py,v retrieving revision 1.8 retrieving revision 1.8.12.1 diff -C2 -d -r1.8 -r1.8.12.1 *** tarfile.py 22 Apr 2003 22:03:11 -0000 1.8 --- tarfile.py 24 Oct 2003 17:47:57 -0000 1.8.12.1 *************** *** 358,362 **** if self.type == "gz": self.fileobj.write(struct.pack("<l", self.crc)) ! self.fileobj.write(struct.pack("<L", self.pos)) if not self._extfileobj: --- 358,362 ---- if self.type == "gz": self.fileobj.write(struct.pack("<l", self.crc)) ! self.fileobj.write(struct.pack("<L", self.pos & 0xffffFFFFL)) if not self._extfileobj:

1 0

python/dist/src/Lib tarfile.py,1.8,1.9
by akuchling＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv23734 Modified Files: tarfile.py Log Message: [Bug #822668] tarfile raises an exception if the tarfile is gzipped and is too large; the gzip filesize should be written out mod 2**32. (Reported by Johan Fredrik Ohman) Index: tarfile.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/tarfile.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tarfile.py 22 Apr 2003 22:03:11 -0000 1.8 --- tarfile.py 24 Oct 2003 17:38:34 -0000 1.9 *************** *** 358,362 **** if self.type == "gz": self.fileobj.write(struct.pack("<l", self.crc)) ! self.fileobj.write(struct.pack("<L", self.pos)) if not self._extfileobj: --- 358,362 ---- if self.type == "gz": self.fileobj.write(struct.pack("<l", self.crc)) ! self.fileobj.write(struct.pack("<L", self.pos & 0xffffFFFFL)) if not self._extfileobj:

1 0

python/dist/src/Lib unittest.py,1.29,1.30
by arigo＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv19056 Modified Files: unittest.py Log Message: Fixed bug introduced in revision 1.27 Index: unittest.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/unittest.py,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** unittest.py 30 Sep 2003 09:25:32 -0000 1.29 --- unittest.py 24 Oct 2003 17:15:29 -0000 1.30 *************** *** 505,509 **** del parts_copy[-1] if not parts_copy: raise ! parts = parts[1:] obj = module for part in parts: --- 505,509 ---- del parts_copy[-1] if not parts_copy: raise ! parts = parts[1:] obj = module for part in parts:

1 0

[Python-checkins] python/dist/src/Objects unicodeobject.c, 2.190.6.8, 2.190.6.9
by doerwalter＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1:/tmp/cvs-serv28564/Objects Modified Files: Tag: release23-maint unicodeobject.c Log Message: Backport checkin: Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). charmaptranslate_makespace() allocates more memory than required for the next replacement but didn't remember that fact, so memory size was growing exponentially every time a replacement string is longer that one character. This fixes SF bug #828737. Index: unicodeobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v retrieving revision 2.190.6.8 retrieving revision 2.190.6.9 diff -C2 -d -r2.190.6.8 -r2.190.6.9 *** unicodeobject.c 18 Oct 2003 09:54:38 -0000 2.190.6.8 --- unicodeobject.c 24 Oct 2003 15:05:29 -0000 2.190.6.9 *************** *** 3224,3240 **** Return 0 on success, -1 on error */ static ! int charmaptranslate_makespace(PyObject **outobj, Py_UNICODE **outp, int *outsize, int requiredsize) { ! if (requiredsize > *outsize) { /* remember old output position */ int outpos = *outp-PyUnicode_AS_UNICODE(*outobj); /* exponentially overallocate to minimize reallocations */ ! if (requiredsize < 2 * *outsize) ! requiredsize = 2 * *outsize; if (_PyUnicode_Resize(outobj, requiredsize)) return -1; *outp = PyUnicode_AS_UNICODE(*outobj) + outpos; - *outsize = requiredsize; } return 0; --- 3224,3240 ---- Return 0 on success, -1 on error */ static ! int charmaptranslate_makespace(PyObject **outobj, Py_UNICODE **outp, int requiredsize) { ! int oldsize = PyUnicode_GET_SIZE(*outobj); ! if (requiredsize > oldsize) { /* remember old output position */ int outpos = *outp-PyUnicode_AS_UNICODE(*outobj); /* exponentially overallocate to minimize reallocations */ ! if (requiredsize < 2 * oldsize) ! requiredsize = 2 * oldsize; if (_PyUnicode_Resize(outobj, requiredsize)) return -1; *outp = PyUnicode_AS_UNICODE(*outobj) + outpos; } return 0; *************** *** 3247,3258 **** Return 0 on success, -1 on error. */ static ! int charmaptranslate_output(Py_UNICODE c, PyObject *mapping, ! PyObject **outobj, int *outsize, Py_UNICODE **outp, PyObject **res) { ! if (charmaptranslate_lookup(c, mapping, res)) return -1; if (*res==NULL) { /* not found => default to 1:1 mapping */ ! *(*outp)++ = (Py_UNICODE)c; } else if (*res==Py_None) --- 3247,3259 ---- Return 0 on success, -1 on error. */ static ! int charmaptranslate_output(const Py_UNICODE *startinp, const Py_UNICODE *curinp, ! int insize, PyObject *mapping, PyObject **outobj, Py_UNICODE **outp, ! PyObject **res) { ! if (charmaptranslate_lookup(*curinp, mapping, res)) return -1; if (*res==NULL) { /* not found => default to 1:1 mapping */ ! *(*outp)++ = *curinp; } else if (*res==Py_None) *************** *** 3270,3275 **** else if (repsize!=0) { /* more than one character */ ! int requiredsize = *outsize + repsize - 1; ! if (charmaptranslate_makespace(outobj, outp, outsize, requiredsize)) return -1; memcpy(*outp, PyUnicode_AS_UNICODE(*res), sizeof(Py_UNICODE)*repsize); --- 3271,3278 ---- else if (repsize!=0) { /* more than one character */ ! int requiredsize = (*outp-PyUnicode_AS_UNICODE(*outobj)) + ! (insize - (*curinp-*startinp)) + ! repsize - 1; ! if (charmaptranslate_makespace(outobj, outp, requiredsize)) return -1; memcpy(*outp, PyUnicode_AS_UNICODE(*res), sizeof(Py_UNICODE)*repsize); *************** *** 3296,3300 **** /* current output position */ int respos = 0; - int ressize; char *reason = "character maps to <undefined>"; PyObject *errorHandler = NULL; --- 3299,3302 ---- *************** *** 3314,3327 **** res = PyUnicode_FromUnicode(NULL, size); if (res == NULL) ! goto onError; if (size == 0) return res; str = PyUnicode_AS_UNICODE(res); - ressize = size; while (p<endp) { /* try to encode it */ PyObject *x = NULL; ! if (charmaptranslate_output(*p, mapping, &res, &ressize, &str, &x)) { Py_XDECREF(x); goto onError; --- 3316,3328 ---- res = PyUnicode_FromUnicode(NULL, size); if (res == NULL) ! goto onError; if (size == 0) return res; str = PyUnicode_AS_UNICODE(res); while (p<endp) { /* try to encode it */ PyObject *x = NULL; ! if (charmaptranslate_output(startp, p, size, mapping, &res, &str, &x)) { Py_XDECREF(x); goto onError; *************** *** 3342,3346 **** /* find all untranslatable characters */ while (collend < endp) { ! if (charmaptranslate_lookup(*collend, mapping, &x)) goto onError; Py_XDECREF(x); --- 3343,3347 ---- /* find all untranslatable characters */ while (collend < endp) { ! if (charmaptranslate_lookup(*collend, mapping, &x)) goto onError; Py_XDECREF(x); *************** *** 3381,3385 **** char *cp; sprintf(buffer, "&#%d;", (int)*p); ! if (charmaptranslate_makespace(&res, &str, &ressize, (str-PyUnicode_AS_UNICODE(res))+strlen(buffer)+(endp-collend))) goto onError; --- 3382,3386 ---- char *cp; sprintf(buffer, "&#%d;", (int)*p); ! if (charmaptranslate_makespace(&res, &str, (str-PyUnicode_AS_UNICODE(res))+strlen(buffer)+(endp-collend))) goto onError; *************** *** 3397,3401 **** /* generate replacement */ repsize = PyUnicode_GET_SIZE(repunicode); ! if (charmaptranslate_makespace(&res, &str, &ressize, (str-PyUnicode_AS_UNICODE(res))+repsize+(endp-collend))) { Py_DECREF(repunicode); --- 3398,3402 ---- /* generate replacement */ repsize = PyUnicode_GET_SIZE(repunicode); ! if (charmaptranslate_makespace(&res, &str, (str-PyUnicode_AS_UNICODE(res))+repsize+(endp-collend))) { Py_DECREF(repunicode); *************** *** 3411,3415 **** /* Resize if we allocated to much */ respos = str-PyUnicode_AS_UNICODE(res); ! if (respos<ressize) { if (_PyUnicode_Resize(&res, respos)) goto onError; --- 3412,3416 ---- /* Resize if we allocated to much */ respos = str-PyUnicode_AS_UNICODE(res); ! if (respos<PyUnicode_GET_SIZE(res)) { if (_PyUnicode_Resize(&res, respos)) goto onError;

1 0

python/dist/src/Lib/test test_codeccallbacks.py, 1.12.8.1, 1.12.8.2
by doerwalter＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv28564/Lib/test Modified Files: Tag: release23-maint test_codeccallbacks.py Log Message: Backport checkin: Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). charmaptranslate_makespace() allocates more memory than required for the next replacement but didn't remember that fact, so memory size was growing exponentially every time a replacement string is longer that one character. This fixes SF bug #828737. Index: test_codeccallbacks.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_codeccallbacks.py,v retrieving revision 1.12.8.1 retrieving revision 1.12.8.2 diff -C2 -d -r1.12.8.1 -r1.12.8.2 *** test_codeccallbacks.py 12 Aug 2003 17:38:22 -0000 1.12.8.1 --- test_codeccallbacks.py 24 Oct 2003 15:05:29 -0000 1.12.8.2 *************** *** 691,694 **** --- 691,706 ---- self.assertRaises(TypeError, u"\xff".translate, {0xff: ()}) + def test_bug828737(self): + charmap = { + ord("&"): u"&", + ord("<"): u"<", + ord(">"): u">", + ord('"'): u""", + } + + for n in (1, 10, 100, 1000): + text = u'abc<def>ghi'*n + text.translate(charmap) + def test_main(): test.test_support.run_unittest(CodecCallbackTest)

1 0

python/dist/src/Lib/test test_codeccallbacks.py, 1.14, 1.15
by doerwalter＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv21163/Lib/test Modified Files: test_codeccallbacks.py Log Message: Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). charmaptranslate_makespace() allocated more memory than required for the next replacement but didn't remember that fact, so memory size was growing exponentially every time a replacement string is longer that one character. This fixes SF bug #828737. Index: test_codeccallbacks.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_codeccallbacks.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** test_codeccallbacks.py 12 Aug 2003 17:34:49 -0000 1.14 --- test_codeccallbacks.py 24 Oct 2003 14:25:28 -0000 1.15 *************** *** 691,694 **** --- 691,706 ---- self.assertRaises(TypeError, u"\xff".translate, {0xff: ()}) + def test_bug828737(self): + charmap = { + ord("&"): u"&", + ord("<"): u"<", + ord(">"): u">", + ord('"'): u""", + } + + for n in (1, 10, 100, 1000): + text = u'abc<def>ghi'*n + text.translate(charmap) + def test_main(): test.test_support.run_unittest(CodecCallbackTest)

1 0

python/dist/src/Objects unicodeobject.c, 2.200, 2.201
by doerwalter＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src/Objects In directory sc8-pr-cvs1:/tmp/cvs-serv21163/Objects Modified Files: unicodeobject.c Log Message: Fix a bug in the memory reallocation code of PyUnicode_TranslateCharmap(). charmaptranslate_makespace() allocated more memory than required for the next replacement but didn't remember that fact, so memory size was growing exponentially every time a replacement string is longer that one character. This fixes SF bug #828737. Index: unicodeobject.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Objects/unicodeobject.c,v retrieving revision 2.200 retrieving revision 2.201 diff -C2 -d -r2.200 -r2.201 *** unicodeobject.c 18 Oct 2003 09:55:08 -0000 2.200 --- unicodeobject.c 24 Oct 2003 14:25:28 -0000 2.201 *************** *** 3223,3239 **** Return 0 on success, -1 on error */ static ! int charmaptranslate_makespace(PyObject **outobj, Py_UNICODE **outp, int *outsize, int requiredsize) { ! if (requiredsize > *outsize) { /* remember old output position */ int outpos = *outp-PyUnicode_AS_UNICODE(*outobj); /* exponentially overallocate to minimize reallocations */ ! if (requiredsize < 2 * *outsize) ! requiredsize = 2 * *outsize; if (_PyUnicode_Resize(outobj, requiredsize) < 0) return -1; *outp = PyUnicode_AS_UNICODE(*outobj) + outpos; - *outsize = requiredsize; } return 0; --- 3223,3239 ---- Return 0 on success, -1 on error */ static ! int charmaptranslate_makespace(PyObject **outobj, Py_UNICODE **outp, int requiredsize) { ! int oldsize = PyUnicode_GET_SIZE(*outobj); ! if (requiredsize > oldsize) { /* remember old output position */ int outpos = *outp-PyUnicode_AS_UNICODE(*outobj); /* exponentially overallocate to minimize reallocations */ ! if (requiredsize < 2 * oldsize) ! requiredsize = 2 * oldsize; if (_PyUnicode_Resize(outobj, requiredsize) < 0) return -1; *outp = PyUnicode_AS_UNICODE(*outobj) + outpos; } return 0; *************** *** 3246,3257 **** Return 0 on success, -1 on error. */ static ! int charmaptranslate_output(Py_UNICODE c, PyObject *mapping, ! PyObject **outobj, int *outsize, Py_UNICODE **outp, PyObject **res) { ! if (charmaptranslate_lookup(c, mapping, res)) return -1; if (*res==NULL) { /* not found => default to 1:1 mapping */ ! *(*outp)++ = (Py_UNICODE)c; } else if (*res==Py_None) --- 3246,3258 ---- Return 0 on success, -1 on error. */ static ! int charmaptranslate_output(const Py_UNICODE *startinp, const Py_UNICODE *curinp, ! int insize, PyObject *mapping, PyObject **outobj, Py_UNICODE **outp, ! PyObject **res) { ! if (charmaptranslate_lookup(*curinp, mapping, res)) return -1; if (*res==NULL) { /* not found => default to 1:1 mapping */ ! *(*outp)++ = *curinp; } else if (*res==Py_None) *************** *** 3269,3274 **** else if (repsize!=0) { /* more than one character */ ! int requiredsize = *outsize + repsize - 1; ! if (charmaptranslate_makespace(outobj, outp, outsize, requiredsize)) return -1; memcpy(*outp, PyUnicode_AS_UNICODE(*res), sizeof(Py_UNICODE)*repsize); --- 3270,3277 ---- else if (repsize!=0) { /* more than one character */ ! int requiredsize = (*outp-PyUnicode_AS_UNICODE(*outobj)) + ! (insize - (*curinp-*startinp)) + ! repsize - 1; ! if (charmaptranslate_makespace(outobj, outp, requiredsize)) return -1; memcpy(*outp, PyUnicode_AS_UNICODE(*res), sizeof(Py_UNICODE)*repsize); *************** *** 3295,3299 **** /* current output position */ int respos = 0; - int ressize; char *reason = "character maps to <undefined>"; PyObject *errorHandler = NULL; --- 3298,3301 ---- *************** *** 3313,3326 **** res = PyUnicode_FromUnicode(NULL, size); if (res == NULL) ! goto onError; if (size == 0) return res; str = PyUnicode_AS_UNICODE(res); - ressize = size; while (p<endp) { /* try to encode it */ PyObject *x = NULL; ! if (charmaptranslate_output(*p, mapping, &res, &ressize, &str, &x)) { Py_XDECREF(x); goto onError; --- 3315,3327 ---- res = PyUnicode_FromUnicode(NULL, size); if (res == NULL) ! goto onError; if (size == 0) return res; str = PyUnicode_AS_UNICODE(res); while (p<endp) { /* try to encode it */ PyObject *x = NULL; ! if (charmaptranslate_output(startp, p, size, mapping, &res, &str, &x)) { Py_XDECREF(x); goto onError; *************** *** 3341,3345 **** /* find all untranslatable characters */ while (collend < endp) { ! if (charmaptranslate_lookup(*collend, mapping, &x)) goto onError; Py_XDECREF(x); --- 3342,3346 ---- /* find all untranslatable characters */ while (collend < endp) { ! if (charmaptranslate_lookup(*collend, mapping, &x)) goto onError; Py_XDECREF(x); *************** *** 3380,3384 **** char *cp; sprintf(buffer, "&#%d;", (int)*p); ! if (charmaptranslate_makespace(&res, &str, &ressize, (str-PyUnicode_AS_UNICODE(res))+strlen(buffer)+(endp-collend))) goto onError; --- 3381,3385 ---- char *cp; sprintf(buffer, "&#%d;", (int)*p); ! if (charmaptranslate_makespace(&res, &str, (str-PyUnicode_AS_UNICODE(res))+strlen(buffer)+(endp-collend))) goto onError; *************** *** 3396,3400 **** /* generate replacement */ repsize = PyUnicode_GET_SIZE(repunicode); ! if (charmaptranslate_makespace(&res, &str, &ressize, (str-PyUnicode_AS_UNICODE(res))+repsize+(endp-collend))) { Py_DECREF(repunicode); --- 3397,3401 ---- /* generate replacement */ repsize = PyUnicode_GET_SIZE(repunicode); ! if (charmaptranslate_makespace(&res, &str, (str-PyUnicode_AS_UNICODE(res))+repsize+(endp-collend))) { Py_DECREF(repunicode); *************** *** 3410,3414 **** /* Resize if we allocated to much */ respos = str-PyUnicode_AS_UNICODE(res); ! if (respos<ressize) { if (_PyUnicode_Resize(&res, respos) < 0) goto onError; --- 3411,3415 ---- /* Resize if we allocated to much */ respos = str-PyUnicode_AS_UNICODE(res); ! if (respos<PyUnicode_GET_SIZE(res)) { if (_PyUnicode_Resize(&res, respos) < 0) goto onError;

1 0

python/dist/src/Lib/test test_itertools.py, 1.21, 1.22
by rhettinger＠users.sourceforge.net 24 Oct '03

24 Oct '03

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1:/tmp/cvs-serv26769/Lib/test Modified Files: test_itertools.py Log Message: Added itertools.tee() It works like the pure python verion except: * it stops storing data after of the iterators gets deallocated * the data queue is implemented with two stacks instead of one dictionary. Index: test_itertools.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_itertools.py,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** test_itertools.py 5 Oct 2003 16:47:36 -0000 1.21 --- test_itertools.py 24 Oct 2003 08:45:23 -0000 1.22 *************** *** 4,7 **** --- 4,8 ---- import sys import operator + import random def onearg(x): *************** *** 199,202 **** --- 200,247 ---- self.assertRaises(ValueError, dropwhile(errfunc, [(4,5)]).next) + def test_tee(self): + n = 100 + def irange(n): + for i in xrange(n): + yield i + + a, b = tee([]) # test empty iterator + self.assertEqual(list(a), []) + self.assertEqual(list(b), []) + + a, b = tee(irange(n)) # test 100% interleaved + self.assertEqual(zip(a,b), zip(range(n),range(n))) + + a, b = tee(irange(n)) # test 0% interleaved + self.assertEqual(list(a), range(n)) + self.assertEqual(list(b), range(n)) + + a, b = tee(irange(n)) # test dealloc of leading iterator + self.assertEqual(a.next(), 0) + self.assertEqual(a.next(), 1) + del a + self.assertEqual(list(b), range(n)) + + a, b = tee(irange(n)) # test dealloc of trailing iterator + self.assertEqual(a.next(), 0) + self.assertEqual(a.next(), 1) + del b + self.assertEqual(list(a), range(2, n)) + + for j in xrange(5): # test randomly interleaved + order = [0]*n + [1]*n + random.shuffle(order) + lists = ([], []) + its = tee(irange(n)) + for i in order: + value = its[i].next() + lists[i].append(value) + self.assertEqual(lists[0], range(n)) + self.assertEqual(lists[1], range(n)) + + self.assertRaises(TypeError, tee) + self.assertRaises(TypeError, tee, 3) + self.assertRaises(TypeError, tee, [1,2], 'x') + def test_StopIteration(self): self.assertRaises(StopIteration, izip().next) *************** *** 209,212 **** --- 254,264 ---- self.assertRaises(StopIteration, islice(StopNow(), None).next) + p, q = tee([]) + self.assertRaises(StopIteration, p.next) + self.assertRaises(StopIteration, q.next) + p, q = tee(StopNow()) + self.assertRaises(StopIteration, p.next) + self.assertRaises(StopIteration, q.next) + self.assertRaises(StopIteration, repeat(None, 0).next) *************** *** 215,218 **** --- 267,316 ---- self.assertRaises(StopIteration, f(lambda x:x, StopNow()).next) + class TestGC(unittest.TestCase): + + def makecycle(self, iterator, container): + container.append(iterator) + iterator.next() + del container, iterator + + def test_chain(self): + a = [] + self.makecycle(chain(a), a) + + def test_cycle(self): + a = [] + self.makecycle(cycle([a]*2), a) + + def test_ifilter(self): + a = [] + self.makecycle(ifilter(lambda x:True, [a]*2), a) + + def test_ifilterfalse(self): + a = [] + self.makecycle(ifilterfalse(lambda x:False, a), a) + + def test_izip(self): + a = [] + self.makecycle(izip([a]*2, [a]*3), a) + + def test_imap(self): + a = [] + self.makecycle(imap(lambda x:x, [a]*2), a) + + def test_islice(self): + a = [] + self.makecycle(islice([a]*2, None), a) + + def test_starmap(self): + a = [] + self.makecycle(starmap(lambda *t: t, [(a,a)]*2), a) + + def test_tee(self): + a = [] + p, q = t = tee([a]*2) + a += [a, p, q, t] + p.next() + del a, p, q, t + def R(seqn): 'Regular generator' *************** *** 291,333 **** return chain(imap(lambda x:x, R(Ig(G(seqn))))) - class TestGC(unittest.TestCase): - - def makecycle(self, iterator, container): - container.append(iterator) - iterator.next() - del container, iterator - - def test_chain(self): - a = [] - self.makecycle(chain(a), a) - - def test_cycle(self): - a = [] - self.makecycle(cycle([a]*2), a) - - def test_ifilter(self): - a = [] - self.makecycle(ifilter(lambda x:True, [a]*2), a) - - def test_ifilterfalse(self): - a = [] - self.makecycle(ifilterfalse(lambda x:False, a), a) - - def test_izip(self): - a = [] - self.makecycle(izip([a]*2, [a]*3), a) - - def test_imap(self): - a = [] - self.makecycle(imap(lambda x:x, [a]*2), a) - - def test_islice(self): - a = [] - self.makecycle(islice([a]*2, None), a) - - def test_starmap(self): - a = [] - self.makecycle(starmap(lambda *t: t, [(a,a)]*2), a) - class TestVariousIteratorArgs(unittest.TestCase): --- 389,392 ---- *************** *** 428,431 **** --- 487,500 ---- self.assertRaises(ZeroDivisionError, list, dropwhile(isOdd, E(s))) + def test_tee(self): + for s in ("123", "", range(1000), ('do', 1.2), xrange(2000,2200,5)): + for g in (G, I, Ig, S, L, R): + it1, it2 = tee(g(s)) + self.assertEqual(list(it1), list(g(s))) + self.assertEqual(list(it2), list(g(s))) + self.assertRaises(TypeError, tee, X(s)) + self.assertRaises(TypeError, list, tee(N(s))[0]) + self.assertRaises(ZeroDivisionError, list, tee(E(s))[0]) + class RegressionTests(unittest.TestCase): *************** *** 532,535 **** --- 601,615 ---- ... return sum(imap(operator.mul, vec1, vec2)) + >>> def flatten(listOfLists): + ... return list(chain(*listOfLists)) + + >>> def repeatfunc(func, times=None, *args): + ... "Repeat calls to func with specified arguments." + ... " Example: repeatfunc(random.random)" + ... if times is None: + ... return starmap(func, repeat(args)) + ... else: + ... return starmap(func, repeat(args, times)) + >>> def window(seq, n=2): ... "Returns a sliding window (of width n) over data from the iterable" *************** *** 543,560 **** ... yield result - >>> def tee(iterable): - ... "Return two independent iterators from a single iterable" - ... def gen(next, data={}, cnt=[0]): - ... dpop = data.pop - ... for i in count(): - ... if i == cnt[0]: - ... item = data[i] = next() - ... cnt[0] += 1 - ... else: - ... item = dpop(i) - ... yield item - ... next = iter(iterable).next - ... return (gen(next), gen(next)) - This is not part of the examples but it tests to make sure the definitions perform as purported. --- 623,626 ---- *************** *** 593,596 **** --- 659,673 ---- 50 + >>> a = [[1, 2, 3], [4, 5, 6]] + >>> flatten(a) + [1, 2, 3, 4, 5, 6] + + >>> list(repeatfunc(pow, 5, 2, 3)) + [8, 8, 8, 8, 8] + + >>> import random + >>> take(5, imap(int, repeatfunc(random.random))) + [0, 0, 0, 0, 0] + >>> list(window('abc')) [('a', 'b'), ('b', 'c')] *************** *** 607,618 **** >>> dotproduct([1,2,3], [4,5,6]) 32 - - >>> x, y = tee(chain(xrange(2,10))) - >>> list(x), list(y) - ([2, 3, 4, 5, 6, 7, 8, 9], [2, 3, 4, 5, 6, 7, 8, 9]) - - >>> x, y = tee(chain(xrange(2,10))) - >>> zip(x, y) - [(2, 2), (3, 3), (4, 4), (5, 5), (6, 6), (7, 7), (8, 8), (9, 9)] """ --- 684,687 ----

1 0