Mailman 3 July 2009 - Python-checkins

r73367 - python/trunk/Doc/library/bisect.rst
by raymond.hettinger Feb. 4, 2010

Feb. 4, 2010

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

r72371 - in python/branches/py3k/Modules: socketmodule.c socketmodule.h
by benjamin.peterson Aug. 12, 2009

Aug. 12, 2009

Author: benjamin.peterson Date: Wed May 6 04:43:58 2009 New Revision: 72371 Log: turn this into a macro Modified: python/branches/py3k/Modules/socketmodule.c python/branches/py3k/Modules/socketmodule.h Modified: python/branches/py3k/Modules/socketmodule.c ============================================================================== --- python/branches/py3k/Modules/socketmodule.c (original) +++ python/branches/py3k/Modules/socketmodule.c Wed May 6 04:43:58 2009 @@ -4146,14 +4146,6 @@ NULL }; -PySocketModule_APIObject * -PySocketModule_ImportModuleAndAPI(void) -{ - void *api; - api = PyCapsule_Import(PySocket_CAPSULE_NAME, 1);; - return (PySocketModule_APIObject *)api; -} - /* Initialize the _socket module. Modified: python/branches/py3k/Modules/socketmodule.h ============================================================================== --- python/branches/py3k/Modules/socketmodule.h (original) +++ python/branches/py3k/Modules/socketmodule.h Wed May 6 04:43:58 2009 @@ -190,38 +190,9 @@ PyObject *error; } PySocketModule_APIObject; -/* XXX The net effect of the following appears to be to define a function - XXX named PySocketModule_APIObject in _ssl.c. It's unclear why it isn't - XXX defined there directly. +#define PySocketModule_ImportModuleAndAPI() PyCapsule_Import(PySocket_CAPSULE_NAME, 1) - >>> It's defined here because other modules might also want to use - >>> the C API. - -*/ -#ifndef PySocket_BUILDING_SOCKET - -/* --- C API ----------------------------------------------------*/ - -/* Interfacestructure to C API for other modules. - Call PySocketModule_ImportModuleAndAPI() to initialize this - structure. After that usage is simple: - - if (!PyArg_ParseTuple(args, "O!|zz:ssl", - &PySocketModule.Sock_Type, (PyObject*)&Sock, - &key_file, &cert_file)) - return NULL; - ... -*/ - -/* You *must* call this before using any of the functions in - PySocketModule and check its outcome; otherwise all accesses will - result in a segfault. Returns 0 on success. */ - -PyAPI_FUNC(PySocketModule_APIObject *) PySocketModule_ImportModuleAndAPI(void); - -#endif /* !PySocket_BUILDING_SOCKET */ - -#ifdef __cplusplus +#ifdef __cpluplus } #endif #endif /* !Py__SOCKET_H */

2 1

Re: [Python-checkins] r65971 - python/trunk/Lib/lib-tk/Tkinter.py
by McKown, John Aug. 4, 2009

Aug. 4, 2009

I have never done anything like this before, so please excuse my ignorance if I am doing something that I shouldn't. But there appears to be a bug in Tkinter.py in the delete function in revision r65971, defined starting in line 2660. The line in question is line 2670 and looks like: if (num_index1 is not None) and (num_index2 is not None): This line gets a message in PySolFC like: TypeError: argument of type 'NoneType' is not iterable If have fixed this in my case by adding the phrase "and (self._tclCommands is not None)" to the line. if (num_index1 is not None) and (num_index2 is not None) and (self._tclCommands is not None): John McKown Systems Engineer IV IT Administrative Services Group HealthMarkets(r) 9151 Boulevard 26 * N. Richland Hills * TX 76010 (817) 255-3225 phone * (817)-961-6183 cell john.mckown(a)healthmarkets.com * www.HealthMarkets.com Confidentiality Notice: This e-mail message may contain confidential or proprietary information. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies of the original message. HealthMarkets(r) is the brand name for products underwritten and issued by the insurance subsidiaries of HealthMarkets, Inc. -The Chesapeake Life Insurance Company(r), Mid-West National Life Insurance Company of TennesseeSM and The MEGA Life and Health Insurance Company.SM

2 1

r74273 - python/branches/release26-maint/Lib/heapq.py
by raymond.hettinger July 31, 2009

July 31, 2009

Author: raymond.hettinger Date: Fri Jul 31 22:21:08 2009 New Revision: 74273 Log: Fix typo (already fixed in 2.7). Modified: python/branches/release26-maint/Lib/heapq.py Modified: python/branches/release26-maint/Lib/heapq.py ============================================================================== --- python/branches/release26-maint/Lib/heapq.py (original) +++ python/branches/release26-maint/Lib/heapq.py Fri Jul 31 22:21:08 2009 @@ -195,7 +195,7 @@ heapify(result) _heappushpop = heappushpop for elem in it: - heappushpop(result, elem) + _heappushpop(result, elem) result.sort(reverse=True) return result

1 0

Python Regression Test Failures refleak (2)
by Neal Norwitz July 30, 2009

July 30, 2009

More important issues: ---------------------- test_ssl leaked [0, 0, 26] references, sum=26 test_urllib2_localnet leaked [-280, 0, 0] references, sum=-280 Less important issues: ---------------------- test_asynchat leaked [-126, 0, 0] references, sum=-126 test_cmd_line leaked [50, 0, 0] references, sum=50 test_file2k leaked [-84, 77, -77] references, sum=-84 test_smtplib leaked [-278, 0, 0] references, sum=-278 test_socketserver leaked [-69, 0, 0] references, sum=-69 test_sys leaked [-21, 42, -21] references, sum=0 test_threading leaked [48, 48, 48] references, sum=144

1 0

r74272 - python/branches/release31-maint
by eric.smith July 30, 2009

July 30, 2009

Author: eric.smith Date: Thu Jul 30 15:46:39 2009 New Revision: 74272 Log: Blocked revisions 74271 via svnmerge ................ r74271 | eric.smith | 2009-07-30 09:43:08 -0400 (Thu, 30 Jul 2009) | 9 lines Merged revisions 74269 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74269 | eric.smith | 2009-07-30 09:39:44 -0400 (Thu, 30 Jul 2009) | 1 line Issue 6330: Fix --enable-unicode=ucs4. ........ ................ Modified: python/branches/release31-maint/ (props changed)

1 0

r74271 - in python/branches/py3k: Objects/stringlib/formatter.h
by eric.smith July 30, 2009

July 30, 2009

Author: eric.smith Date: Thu Jul 30 15:43:08 2009 New Revision: 74271 Log: Merged revisions 74269 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74269 | eric.smith | 2009-07-30 09:39:44 -0400 (Thu, 30 Jul 2009) | 1 line Issue 6330: Fix --enable-unicode=ucs4. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Objects/stringlib/formatter.h Modified: python/branches/py3k/Objects/stringlib/formatter.h ============================================================================== --- python/branches/py3k/Objects/stringlib/formatter.h (original) +++ python/branches/py3k/Objects/stringlib/formatter.h Thu Jul 30 15:43:08 2009 @@ -32,7 +32,7 @@ PyErr_Format(PyExc_ValueError, "Unknown format code '%c' " "for object of type '%.200s'", - presentation_type, + (char)presentation_type, type_name); #if STRINGLIB_IS_UNICODE else @@ -44,6 +44,24 @@ #endif } +static void +invalid_comma_type(STRINGLIB_CHAR presentation_type) +{ +#if STRINGLIB_IS_UNICODE + /* See comment in unknown_presentation_type */ + if (presentation_type > 32 && presentation_type < 128) +#endif + PyErr_Format(PyExc_ValueError, + "Cannot specify ',' with '%c'.", + (char)presentation_type); +#if STRINGLIB_IS_UNICODE + else + PyErr_Format(PyExc_ValueError, + "Cannot specify ',' with '\\x%x'.", + (unsigned int)presentation_type); +#endif +} + /* get_integer consumes 0 or more decimal digit characters from an input string, updates *result with the corresponding positive @@ -253,8 +271,7 @@ /* These are allowed. See PEP 378.*/ break; default: - PyErr_Format(PyExc_ValueError, - "Cannot specify ',' with '%c'.", format->type); + invalid_comma_type(format->type); return 0; } }

1 0

r74270 - python/branches/release26-maint
by eric.smith July 30, 2009

July 30, 2009

Author: eric.smith Date: Thu Jul 30 15:41:41 2009 New Revision: 74270 Log: Blocked revisions 74269 via svnmerge ........ r74269 | eric.smith | 2009-07-30 09:39:44 -0400 (Thu, 30 Jul 2009) | 1 line Issue 6330: Fix --enable-unicode=ucs4. ........ Modified: python/branches/release26-maint/ (props changed)

1 0

r74269 - python/trunk/Objects/stringlib/formatter.h
by eric.smith July 30, 2009

July 30, 2009

Author: eric.smith Date: Thu Jul 30 15:39:44 2009 New Revision: 74269 Log: Issue 6330: Fix --enable-unicode=ucs4. Modified: python/trunk/Objects/stringlib/formatter.h Modified: python/trunk/Objects/stringlib/formatter.h ============================================================================== --- python/trunk/Objects/stringlib/formatter.h (original) +++ python/trunk/Objects/stringlib/formatter.h Thu Jul 30 15:39:44 2009 @@ -32,7 +32,7 @@ PyErr_Format(PyExc_ValueError, "Unknown format code '%c' " "for object of type '%.200s'", - presentation_type, + (char)presentation_type, type_name); #if STRINGLIB_IS_UNICODE else @@ -44,6 +44,24 @@ #endif } +static void +invalid_comma_type(STRINGLIB_CHAR presentation_type) +{ +#if STRINGLIB_IS_UNICODE + /* See comment in unknown_presentation_type */ + if (presentation_type > 32 && presentation_type < 128) +#endif + PyErr_Format(PyExc_ValueError, + "Cannot specify ',' with '%c'.", + (char)presentation_type); +#if STRINGLIB_IS_UNICODE + else + PyErr_Format(PyExc_ValueError, + "Cannot specify ',' with '\\x%x'.", + (unsigned int)presentation_type); +#endif +} + /* get_integer consumes 0 or more decimal digit characters from an input string, updates *result with the corresponding positive @@ -253,8 +271,7 @@ /* These are allowed. See PEP 378.*/ break; default: - PyErr_Format(PyExc_ValueError, - "Cannot specify ',' with '%c'.", format->type); + invalid_comma_type(format->type); return 0; } }

1 0

r74268 - in python/branches/release31-maint: Doc/library/fractions.rst
by mark.dickinson July 30, 2009

July 30, 2009

Author: mark.dickinson Date: Thu Jul 30 12:03:32 2009 New Revision: 74268 Log: Merged revisions 74267 via svnmerge from svn+ssh://pythondev@www.python.org/python/branches/py3k ................ r74267 | mark.dickinson | 2009-07-30 11:02:09 +0100 (Thu, 30 Jul 2009) | 9 lines Merged revisions 74265 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r74265 | mark.dickinson | 2009-07-30 11:00:10 +0100 (Thu, 30 Jul 2009) | 1 line Documentation fix for change introduced in r71832 ........ ................ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Doc/library/fractions.rst Modified: python/branches/release31-maint/Doc/library/fractions.rst ============================================================================== --- python/branches/release31-maint/Doc/library/fractions.rst (original) +++ python/branches/release31-maint/Doc/library/fractions.rst Thu Jul 30 12:03:32 2009 @@ -18,7 +18,7 @@ Fraction(string) The first version requires that *numerator* and *denominator* are - instances of :class:`numbers.Integral` and returns a new + instances of :class:`numbers.Rational` and returns a new :class:`Fraction` instance with value ``numerator/denominator``. If *denominator* is :const:`0`, it raises a :exc:`ZeroDivisionError`. The second version requires that

1 0