Mailman 3 November 2009 - Python-checkins

r73367 - python/trunk/Doc/library/bisect.rst
by raymond.hettinger 05 Feb '10

05 Feb '10

Author: raymond.hettinger Date: Fri Jun 12 00:04:00 2009 New Revision: 73367 Log: Add example of how to do key lookups with bisect(). Modified: python/trunk/Doc/library/bisect.rst Modified: python/trunk/Doc/library/bisect.rst ============================================================================== --- python/trunk/Doc/library/bisect.rst (original) +++ python/trunk/Doc/library/bisect.rst Fri Jun 12 00:04:00 2009 @@ -85,4 +85,22 @@ >>> map(grade, [33, 99, 77, 44, 12, 88]) ['E', 'A', 'B', 'D', 'F', 'A'] +Unlike the :func:`sorted` function, it does not make sense for the :func:`bisect` +functions to have *key* or *reversed* arguments because that would lead to an +inefficent design (successive calls to bisect functions would not "remember" +all of the previous key lookups). +Instead, it is better to search a list of precomputed keys to find the index +of the record in question:: + + >>> data = [('red', 5), ('blue', 1), ('yellow', 8), ('black', 0)] + >>> data.sort(key=lambda r: r[1]) # precomputed list of keys + >>> keys = [r[1] for r in data] + >>> data[bisect_left(keys, 0)] + ('black', 0) + >>> data[bisect_left(keys, 1)] + ('blue', 1) + >>> data[bisect_left(keys, 5)] + ('red', 5) + >>> data[bisect_left(keys, 8)] + ('yellow', 8)

3 2

Daily py3k reference leaks (r76609): sum=45
by solipsis＠pitrou.net 01 Dec '09

01 Dec '09

py3k results for svn r76609 (hg cset 66849d804d3c) -------------------------------------------------- test_urllib leaked [10, 2, 4] references, sum=16 test_zipimport_support leaked [29, 0, 0] references, sum=29 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/py3k/refleaks/reflogtJ_ZG2', '-x', 'test_httpservers']

1 0

Python Regression Test Failures refleak (2)
by Neal Norwitz 01 Dec '09

01 Dec '09

More important issues: ---------------------- test_distutils leaked [0, 0, 25] references, sum=25 test_zipimport_support leaked [0, 0, -25] references, sum=-25 Less important issues: ---------------------- test_cmd_line leaked [-25, 0, 0] references, sum=-25 test_popen2 leaked [4, -29, 25] references, sum=0

1 0

r76609 - in python/branches/py3k: Lib/test/test_itertools.py Modules/itertoolsmodule.c
by raymond.hettinger 01 Dec '09

01 Dec '09

Author: raymond.hettinger Date: Mon Nov 30 23:02:31 2009 New Revision: 76609 Log: Issue 7410: deepcopy of itertools.count() reset the count. Modified: python/branches/py3k/Lib/test/test_itertools.py python/branches/py3k/Modules/itertoolsmodule.c Modified: python/branches/py3k/Lib/test/test_itertools.py ============================================================================== --- python/branches/py3k/Lib/test/test_itertools.py (original) +++ python/branches/py3k/Lib/test/test_itertools.py Mon Nov 30 23:02:31 2009 @@ -7,6 +7,8 @@ import sys import operator import random +import copy +import pickle from functools import reduce maxsize = support.MAX_Py_ssize_t minsize = -maxsize-1 @@ -352,6 +354,13 @@ r2 = 'count(%r)'.__mod__(i).replace('L', '') self.assertEqual(r1, r2) + # check copy, deepcopy, pickle + for value in -3, 3, maxsize-5, maxsize+5: + c = count(value) + self.assertEqual(next(copy.copy(c)), value) + self.assertEqual(next(copy.deepcopy(c)), value) + self.assertEqual(next(pickle.loads(pickle.dumps(c))), value) + def test_count_with_stride(self): self.assertEqual(lzip('abc',count(2,3)), [('a', 2), ('b', 5), ('c', 8)]) self.assertEqual(lzip('abc',count(start=2,step=3)), Modified: python/branches/py3k/Modules/itertoolsmodule.c ============================================================================== --- python/branches/py3k/Modules/itertoolsmodule.c (original) +++ python/branches/py3k/Modules/itertoolsmodule.c Mon Nov 30 23:02:31 2009 @@ -3049,6 +3049,22 @@ lz->long_cnt, lz->long_step); } +static PyObject * +count_reduce(countobject *lz) +{ + if (lz->cnt == PY_SSIZE_T_MAX) + return Py_BuildValue("O(OO)", Py_TYPE(lz), lz->long_cnt, lz->long_step); + return Py_BuildValue("O(n)", Py_TYPE(lz), lz->cnt); +} + +PyDoc_STRVAR(count_reduce_doc, "Return state information for pickling."); + +static PyMethodDef count_methods[] = { + {"__reduce__", (PyCFunction)count_reduce, METH_NOARGS, + count_reduce_doc}, + {NULL, NULL} /* sentinel */ +}; + PyDoc_STRVAR(count_doc, "count(start=0, step=1]) --> count object\n\ \n\ @@ -3090,7 +3106,7 @@ 0, /* tp_weaklistoffset */ PyObject_SelfIter, /* tp_iter */ (iternextfunc)count_next, /* tp_iternext */ - 0, /* tp_methods */ + count_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ 0, /* tp_base */

1 0

Re: [Python-checkins] r76603 - python/trunk/PC/VS8.0/pythoncore.vcproj
by Mark Dickinson 01 Dec '09

01 Dec '09

On Mon, Nov 30, 2009 at 9:44 PM, raymond.hettinger <python-checkins(a)python.org> wrote: > Author: raymond.hettinger > Date: Mon Nov 30 22:14:25 2009 > New Revision: 76603 > > Log: > Update project file for new file: dtoa.c Thanks; I missed that. I've now added dtoa.h as well, and put dtoa.c in the appropriate place in the PC/VS7.1 and PC/VC6 directories.

1 0

r76608 - in python/branches/release31-maint: Lib/test/test_itertools.py Misc/NEWS Modules/itertoolsmodule.c
by raymond.hettinger 01 Dec '09

01 Dec '09

Author: raymond.hettinger Date: Mon Nov 30 22:55:17 2009 New Revision: 76608 Log: Issue #7410: deepcopy of itertools.count was resetting the count. Modified: python/branches/release31-maint/Lib/test/test_itertools.py python/branches/release31-maint/Misc/NEWS python/branches/release31-maint/Modules/itertoolsmodule.c Modified: python/branches/release31-maint/Lib/test/test_itertools.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_itertools.py (original) +++ python/branches/release31-maint/Lib/test/test_itertools.py Mon Nov 30 22:55:17 2009 @@ -7,6 +7,8 @@ import sys import operator import random +import copy +import pickle from functools import reduce maxsize = support.MAX_Py_ssize_t minsize = -maxsize-1 @@ -352,6 +354,13 @@ r2 = 'count(%r)'.__mod__(i).replace('L', '') self.assertEqual(r1, r2) + # check copy, deepcopy, pickle + for value in -3, 3, maxsize-5, maxsize+5: + c = count(value) + self.assertEqual(next(copy.copy(c)), value) + self.assertEqual(next(copy.deepcopy(c)), value) + self.assertEqual(next(pickle.loads(pickle.dumps(c))), value) + def test_count_with_stride(self): self.assertEqual(lzip('abc',count(2,3)), [('a', 2), ('b', 5), ('c', 8)]) self.assertEqual(lzip('abc',count(start=2,step=3)), Modified: python/branches/release31-maint/Misc/NEWS ============================================================================== --- python/branches/release31-maint/Misc/NEWS (original) +++ python/branches/release31-maint/Misc/NEWS Mon Nov 30 22:55:17 2009 @@ -52,6 +52,8 @@ Library ------- +- Issue #7410: deepcopy of itertools.count was resetting the count. + - Issue #4486: When an exception has an explicit cause, do not print its implicit context too. This affects the `traceback` module as well as built-in exception printing. Modified: python/branches/release31-maint/Modules/itertoolsmodule.c ============================================================================== --- python/branches/release31-maint/Modules/itertoolsmodule.c (original) +++ python/branches/release31-maint/Modules/itertoolsmodule.c Mon Nov 30 22:55:17 2009 @@ -3049,6 +3049,22 @@ lz->long_cnt, lz->long_step); } +static PyObject * +count_reduce(countobject *lz) +{ + if (lz->cnt == PY_SSIZE_T_MAX) + return Py_BuildValue("O(OO)", Py_TYPE(lz), lz->long_cnt, lz->long_step); + return Py_BuildValue("O(n)", Py_TYPE(lz), lz->cnt); +} + +PyDoc_STRVAR(count_reduce_doc, "Return state information for pickling."); + +static PyMethodDef count_methods[] = { + {"__reduce__", (PyCFunction)count_reduce, METH_NOARGS, + count_reduce_doc}, + {NULL, NULL} /* sentinel */ +}; + PyDoc_STRVAR(count_doc, "count(start=0, step=1]) --> count object\n\ \n\ @@ -3090,7 +3106,7 @@ 0, /* tp_weaklistoffset */ PyObject_SelfIter, /* tp_iter */ (iternextfunc)count_next, /* tp_iternext */ - 0, /* tp_methods */ + count_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ 0, /* tp_base */

1 0

r76607 - python/branches/py3k
by mark.dickinson 01 Dec '09

01 Dec '09

Author: mark.dickinson Date: Mon Nov 30 22:53:52 2009 New Revision: 76607 Log: Blocked revisions 76603,76605 via svnmerge ........ r76603 | raymond.hettinger | 2009-11-30 21:14:25 +0000 (Mon, 30 Nov 2009) | 1 line Update project file for new file: dtoa.c ........ r76605 | mark.dickinson | 2009-11-30 21:51:30 +0000 (Mon, 30 Nov 2009) | 2 lines Add dtoa.c and dtoa.h to the relevant project files. ........ Modified: python/branches/py3k/ (props changed)

1 0

r76606 - python/branches/release26-maint
by mark.dickinson 01 Dec '09

01 Dec '09

Author: mark.dickinson Date: Mon Nov 30 22:53:09 2009 New Revision: 76606 Log: Blocked revisions 76603,76605 via svnmerge ........ r76603 | raymond.hettinger | 2009-11-30 21:14:25 +0000 (Mon, 30 Nov 2009) | 1 line Update project file for new file: dtoa.c ........ r76605 | mark.dickinson | 2009-11-30 21:51:30 +0000 (Mon, 30 Nov 2009) | 2 lines Add dtoa.c and dtoa.h to the relevant project files. ........ Modified: python/branches/release26-maint/ (props changed)

1 0

r76605 - in python/trunk/PC: VC6/pythoncore.dsp VS7.1/pythoncore.vcproj VS8.0/pythoncore.vcproj
by mark.dickinson 01 Dec '09

01 Dec '09

Author: mark.dickinson Date: Mon Nov 30 22:51:30 2009 New Revision: 76605 Log: Add dtoa.c and dtoa.h to the relevant project files. Modified: python/trunk/PC/VC6/pythoncore.dsp python/trunk/PC/VS7.1/pythoncore.vcproj python/trunk/PC/VS8.0/pythoncore.vcproj Modified: python/trunk/PC/VC6/pythoncore.dsp ============================================================================== --- python/trunk/PC/VC6/pythoncore.dsp (original) +++ python/trunk/PC/VC6/pythoncore.dsp Mon Nov 30 22:51:30 2009 @@ -329,6 +329,10 @@ # End Source File # Begin Source File +SOURCE=..\..\Python\dtoa.c +# End Source File +# Begin Source File + SOURCE=..\..\Python\dynload_win.c # End Source File # Begin Source File Modified: python/trunk/PC/VS7.1/pythoncore.vcproj ============================================================================== --- python/trunk/PC/VS7.1/pythoncore.vcproj (original) +++ python/trunk/PC/VS7.1/pythoncore.vcproj Mon Nov 30 22:51:30 2009 @@ -512,6 +512,9 @@ RelativePath="..\..\PC\dl_nt.c"> </File> <File + RelativePath="..\..\Python\dtoa.c"> + </File> + <File RelativePath="..\..\Python\dynload_win.c"> </File> <File Modified: python/trunk/PC/VS8.0/pythoncore.vcproj ============================================================================== --- python/trunk/PC/VS8.0/pythoncore.vcproj (original) +++ python/trunk/PC/VS8.0/pythoncore.vcproj Mon Nov 30 22:51:30 2009 @@ -715,6 +715,10 @@ > </File> <File + RelativePath="..\..\Include\dtoa.h" + > + </File> + <File RelativePath="..\..\Include\enumobject.h" > </File>

1 0

r76604 - python/branches/release26-maint/Modules/itertoolsmodule.c
by raymond.hettinger 01 Dec '09

01 Dec '09

Author: raymond.hettinger Date: Mon Nov 30 22:33:31 2009 New Revision: 76604 Log: Add sentinel Modified: python/branches/release26-maint/Modules/itertoolsmodule.c Modified: python/branches/release26-maint/Modules/itertoolsmodule.c ============================================================================== --- python/branches/release26-maint/Modules/itertoolsmodule.c (original) +++ python/branches/release26-maint/Modules/itertoolsmodule.c Mon Nov 30 22:33:31 2009 @@ -2919,6 +2919,7 @@ static PyMethodDef count_methods[] = { {"__reduce__", (PyCFunction)count_reduce, METH_NOARGS, count_reduce_doc}, + {NULL, NULL} /* sentinel */ }; PyDoc_STRVAR(count_doc,

1 0