Mailman 3 November 2010 - Python-checkins

r86887 - python/branches/py3k/Doc/library/pickle.rst
by georg.brandl Nov. 30, 2010

Nov. 30, 2010

Author: georg.brandl Date: Tue Nov 30 15:57:54 2010 New Revision: 86887 Log: Fix typo. Modified: python/branches/py3k/Doc/library/pickle.rst Modified: python/branches/py3k/Doc/library/pickle.rst ============================================================================== --- python/branches/py3k/Doc/library/pickle.rst (original) +++ python/branches/py3k/Doc/library/pickle.rst Tue Nov 30 15:57:54 2010 @@ -42,7 +42,7 @@ objects. :mod:`marshal` exists primarily to support Python's :file:`.pyc` files. -The :mod:`pickle` module differs from :mod:`marshal` several significant ways: +The :mod:`pickle` module differs from :mod:`marshal` in several significant ways: * The :mod:`pickle` module keeps track of the objects it has already serialized, so that later references to the same object won't be serialized again.

1 0

r86886 - python/branches/release31-maint
by georg.brandl Nov. 30, 2010

Nov. 30, 2010

Author: georg.brandl Date: Tue Nov 30 10:48:38 2010 New Revision: 86886 Log: Blocked revisions 86883-86884 via svnmerge ........ r86883 | georg.brandl | 2010-11-30 10:30:54 +0100 (Di, 30 Nov 2010) | 1 line Include structseq.h in Python.h, and remove now-redundant includes in individual sources. ........ r86884 | georg.brandl | 2010-11-30 10:41:01 +0100 (Di, 30 Nov 2010) | 1 line Remove redundant includes of headers that are already included by Python.h. ........ Modified: python/branches/release31-maint/ (props changed)

1 0

r86885 - python/branches/release27-maint
by georg.brandl Nov. 30, 2010

Nov. 30, 2010

Author: georg.brandl Date: Tue Nov 30 10:41:59 2010 New Revision: 86885 Log: Blocked revisions 86883-86884 via svnmerge ........ r86883 | georg.brandl | 2010-11-30 10:30:54 +0100 (Di, 30 Nov 2010) | 1 line Include structseq.h in Python.h, and remove now-redundant includes in individual sources. ........ r86884 | georg.brandl | 2010-11-30 10:41:01 +0100 (Di, 30 Nov 2010) | 1 line Remove redundant includes of headers that are already included by Python.h. ........ Modified: python/branches/release27-maint/ (props changed)

1 0

r86884 - in python/branches/py3k: Modules/_datetimemodule.c Modules/_lsprof.c Modules/main.c Modules/parsermodule.c Modules/signalmodule.c Modules/symtablemodule.c Objects/funcobject.c Objects/genobject.c Objects/object.c Objects/unicodectype.c Objects/unicodeobject.c Python/ast.c Python/bltinmodule.c Python/ceval.c Python/compile.c Python/future.c Python/import.c Python/peephole.c Python/pyarena.c Python/pythonrun.c Python/sysmodule.c Python/traceback.c
by georg.brandl Nov. 30, 2010

Nov. 30, 2010

Author: georg.brandl Date: Tue Nov 30 10:41:01 2010 New Revision: 86884 Log: Remove redundant includes of headers that are already included by Python.h. Modified: python/branches/py3k/Modules/_datetimemodule.c python/branches/py3k/Modules/_lsprof.c python/branches/py3k/Modules/main.c python/branches/py3k/Modules/parsermodule.c python/branches/py3k/Modules/signalmodule.c python/branches/py3k/Modules/symtablemodule.c python/branches/py3k/Objects/funcobject.c python/branches/py3k/Objects/genobject.c python/branches/py3k/Objects/object.c python/branches/py3k/Objects/unicodectype.c python/branches/py3k/Objects/unicodeobject.c python/branches/py3k/Python/ast.c python/branches/py3k/Python/bltinmodule.c python/branches/py3k/Python/ceval.c python/branches/py3k/Python/compile.c python/branches/py3k/Python/future.c python/branches/py3k/Python/import.c python/branches/py3k/Python/peephole.c python/branches/py3k/Python/pyarena.c python/branches/py3k/Python/pythonrun.c python/branches/py3k/Python/sysmodule.c python/branches/py3k/Python/traceback.c Modified: python/branches/py3k/Modules/_datetimemodule.c ============================================================================== --- python/branches/py3k/Modules/_datetimemodule.c (original) +++ python/branches/py3k/Modules/_datetimemodule.c Tue Nov 30 10:41:01 2010 @@ -3,7 +3,6 @@ */ #include "Python.h" -#include "modsupport.h" #include "structmember.h" #include <time.h> Modified: python/branches/py3k/Modules/_lsprof.c ============================================================================== --- python/branches/py3k/Modules/_lsprof.c (original) +++ python/branches/py3k/Modules/_lsprof.c Tue Nov 30 10:41:01 2010 @@ -1,5 +1,4 @@ #include "Python.h" -#include "compile.h" #include "frameobject.h" #include "rotatingtree.h" Modified: python/branches/py3k/Modules/main.c ============================================================================== --- python/branches/py3k/Modules/main.c (original) +++ python/branches/py3k/Modules/main.c Tue Nov 30 10:41:01 2010 @@ -2,7 +2,6 @@ #include "Python.h" #include "osdefs.h" -#include "import.h" #include <locale.h> Modified: python/branches/py3k/Modules/parsermodule.c ============================================================================== --- python/branches/py3k/Modules/parsermodule.c (original) +++ python/branches/py3k/Modules/parsermodule.c Tue Nov 30 10:41:01 2010 @@ -34,10 +34,8 @@ #include "grammar.h" #include "parsetok.h" /* ISTERMINAL() / ISNONTERMINAL() */ -#include "compile.h" #undef Yield #include "ast.h" -#include "pyarena.h" extern grammar _PyParser_Grammar; /* From graminit.c */ Modified: python/branches/py3k/Modules/signalmodule.c ============================================================================== --- python/branches/py3k/Modules/signalmodule.c (original) +++ python/branches/py3k/Modules/signalmodule.c Tue Nov 30 10:41:01 2010 @@ -4,7 +4,6 @@ /* XXX Signals should be recorded per thread, now we have thread state. */ #include "Python.h" -#include "intrcheck.h" #ifdef MS_WINDOWS #include <Windows.h> Modified: python/branches/py3k/Modules/symtablemodule.c ============================================================================== --- python/branches/py3k/Modules/symtablemodule.c (original) +++ python/branches/py3k/Modules/symtablemodule.c Tue Nov 30 10:41:01 2010 @@ -1,7 +1,6 @@ #include "Python.h" #include "code.h" -#include "compile.h" #include "Python-ast.h" #include "symtable.h" Modified: python/branches/py3k/Objects/funcobject.c ============================================================================== --- python/branches/py3k/Objects/funcobject.c (original) +++ python/branches/py3k/Objects/funcobject.c Tue Nov 30 10:41:01 2010 @@ -3,7 +3,6 @@ #include "Python.h" #include "code.h" -#include "eval.h" #include "structmember.h" PyObject * Modified: python/branches/py3k/Objects/genobject.c ============================================================================== --- python/branches/py3k/Objects/genobject.c (original) +++ python/branches/py3k/Objects/genobject.c Tue Nov 30 10:41:01 2010 @@ -2,8 +2,6 @@ #include "Python.h" #include "frameobject.h" -#include "genobject.h" -#include "ceval.h" #include "structmember.h" #include "opcode.h" Modified: python/branches/py3k/Objects/object.c ============================================================================== --- python/branches/py3k/Objects/object.c (original) +++ python/branches/py3k/Objects/object.c Tue Nov 30 10:41:01 2010 @@ -2,7 +2,6 @@ /* Generic object operations; and implementation of None (NoObject) */ #include "Python.h" -#include "sliceobject.h" /* For PyEllipsis_Type */ #include "frameobject.h" #ifdef __cplusplus Modified: python/branches/py3k/Objects/unicodectype.c ============================================================================== --- python/branches/py3k/Objects/unicodectype.c (original) +++ python/branches/py3k/Objects/unicodectype.c Tue Nov 30 10:41:01 2010 @@ -9,7 +9,6 @@ */ #include "Python.h" -#include "unicodeobject.h" #define ALPHA_MASK 0x01 #define DECIMAL_MASK 0x02 Modified: python/branches/py3k/Objects/unicodeobject.c ============================================================================== --- python/branches/py3k/Objects/unicodeobject.c (original) +++ python/branches/py3k/Objects/unicodeobject.c Tue Nov 30 10:41:01 2010 @@ -43,7 +43,6 @@ #include "Python.h" #include "bytes_methods.h" -#include "unicodeobject.h" #include "ucnhash.h" #ifdef MS_WINDOWS Modified: python/branches/py3k/Python/ast.c ============================================================================== --- python/branches/py3k/Python/ast.c (original) +++ python/branches/py3k/Python/ast.c Tue Nov 30 10:41:01 2010 @@ -7,7 +7,6 @@ #include "Python-ast.h" #include "grammar.h" #include "node.h" -#include "pyarena.h" #include "ast.h" #include "token.h" #include "parsetok.h" Modified: python/branches/py3k/Python/bltinmodule.c ============================================================================== --- python/branches/py3k/Python/bltinmodule.c (original) +++ python/branches/py3k/Python/bltinmodule.c Tue Nov 30 10:41:01 2010 @@ -5,7 +5,6 @@ #include "node.h" #include "code.h" -#include "eval.h" #include <ctype.h> Modified: python/branches/py3k/Python/ceval.c ============================================================================== --- python/branches/py3k/Python/ceval.c (original) +++ python/branches/py3k/Python/ceval.c Tue Nov 30 10:41:01 2010 @@ -13,7 +13,6 @@ #include "code.h" #include "frameobject.h" -#include "eval.h" #include "opcode.h" #include "structmember.h" Modified: python/branches/py3k/Python/compile.c ============================================================================== --- python/branches/py3k/Python/compile.c (original) +++ python/branches/py3k/Python/compile.c Tue Nov 30 10:41:01 2010 @@ -25,10 +25,8 @@ #include "Python-ast.h" #include "node.h" -#include "pyarena.h" #include "ast.h" #include "code.h" -#include "compile.h" #include "symtable.h" #include "opcode.h" Modified: python/branches/py3k/Python/future.c ============================================================================== --- python/branches/py3k/Python/future.c (original) +++ python/branches/py3k/Python/future.c Tue Nov 30 10:41:01 2010 @@ -4,7 +4,6 @@ #include "token.h" #include "graminit.h" #include "code.h" -#include "compile.h" #include "symtable.h" #define UNDEFINED_FUTURE_FEATURE "future feature %.100s is not defined" Modified: python/branches/py3k/Python/import.c ============================================================================== --- python/branches/py3k/Python/import.c (original) +++ python/branches/py3k/Python/import.c Tue Nov 30 10:41:01 2010 @@ -5,13 +5,9 @@ #include "Python-ast.h" #undef Yield /* undefine macro conflicting with winbase.h */ -#include "pyarena.h" -#include "pythonrun.h" #include "errcode.h" #include "marshal.h" #include "code.h" -#include "compile.h" -#include "eval.h" #include "osdefs.h" #include "importdl.h" Modified: python/branches/py3k/Python/peephole.c ============================================================================== --- python/branches/py3k/Python/peephole.c (original) +++ python/branches/py3k/Python/peephole.c Tue Nov 30 10:41:01 2010 @@ -4,10 +4,8 @@ #include "Python-ast.h" #include "node.h" -#include "pyarena.h" #include "ast.h" #include "code.h" -#include "compile.h" #include "symtable.h" #include "opcode.h" Modified: python/branches/py3k/Python/pyarena.c ============================================================================== --- python/branches/py3k/Python/pyarena.c (original) +++ python/branches/py3k/Python/pyarena.c Tue Nov 30 10:41:01 2010 @@ -1,5 +1,4 @@ #include "Python.h" -#include "pyarena.h" /* A simple arena block structure. Modified: python/branches/py3k/Python/pythonrun.c ============================================================================== --- python/branches/py3k/Python/pythonrun.c (original) +++ python/branches/py3k/Python/pythonrun.c Tue Nov 30 10:41:01 2010 @@ -11,14 +11,10 @@ #include "parsetok.h" #include "errcode.h" #include "code.h" -#include "compile.h" #include "symtable.h" -#include "pyarena.h" #include "ast.h" -#include "eval.h" #include "marshal.h" #include "osdefs.h" -#include "abstract.h" #ifdef HAVE_SIGNAL_H #include <signal.h> Modified: python/branches/py3k/Python/sysmodule.c ============================================================================== --- python/branches/py3k/Python/sysmodule.c (original) +++ python/branches/py3k/Python/sysmodule.c Tue Nov 30 10:41:01 2010 @@ -17,7 +17,6 @@ #include "Python.h" #include "code.h" #include "frameobject.h" -#include "eval.h" #include "osdefs.h" Modified: python/branches/py3k/Python/traceback.c ============================================================================== --- python/branches/py3k/Python/traceback.c (original) +++ python/branches/py3k/Python/traceback.c Tue Nov 30 10:41:01 2010 @@ -7,7 +7,6 @@ #include "frameobject.h" #include "structmember.h" #include "osdefs.h" -#include "traceback.h" #ifdef HAVE_FCNTL_H #include <fcntl.h> #endif

1 0

r86883 - in python/branches/py3k: Include/Python.h Misc/NEWS Modules/_lsprof.c Modules/_struct.c Modules/grpmodule.c Modules/posixmodule.c Modules/pwdmodule.c Modules/resource.c Modules/spwdmodule.c Modules/timemodule.c Objects/floatobject.c Objects/longobject.c Objects/structseq.c Python/sysmodule.c
by georg.brandl Nov. 30, 2010

Nov. 30, 2010

Author: georg.brandl Date: Tue Nov 30 10:30:54 2010 New Revision: 86883 Log: Include structseq.h in Python.h, and remove now-redundant includes in individual sources. Modified: python/branches/py3k/Include/Python.h python/branches/py3k/Misc/NEWS python/branches/py3k/Modules/_lsprof.c python/branches/py3k/Modules/_struct.c python/branches/py3k/Modules/grpmodule.c python/branches/py3k/Modules/posixmodule.c python/branches/py3k/Modules/pwdmodule.c python/branches/py3k/Modules/resource.c python/branches/py3k/Modules/spwdmodule.c python/branches/py3k/Modules/timemodule.c python/branches/py3k/Objects/floatobject.c python/branches/py3k/Objects/longobject.c python/branches/py3k/Objects/structseq.c python/branches/py3k/Python/sysmodule.c Modified: python/branches/py3k/Include/Python.h ============================================================================== --- python/branches/py3k/Include/Python.h (original) +++ python/branches/py3k/Include/Python.h Tue Nov 30 10:30:54 2010 @@ -98,6 +98,7 @@ #include "descrobject.h" #include "warnings.h" #include "weakrefobject.h" +#include "structseq.h" #include "codecs.h" #include "pyerrors.h" Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Tue Nov 30 10:30:54 2010 @@ -136,6 +136,8 @@ C-API ----- +- structseq.h is now included in Python.h. + - Loosen PyArg_ValidateKeywordArguments to allow dict subclasses. Tests Modified: python/branches/py3k/Modules/_lsprof.c ============================================================================== --- python/branches/py3k/Modules/_lsprof.c (original) +++ python/branches/py3k/Modules/_lsprof.c Tue Nov 30 10:30:54 2010 @@ -1,7 +1,6 @@ #include "Python.h" #include "compile.h" #include "frameobject.h" -#include "structseq.h" #include "rotatingtree.h" #if !defined(HAVE_LONG_LONG) Modified: python/branches/py3k/Modules/_struct.c ============================================================================== --- python/branches/py3k/Modules/_struct.c (original) +++ python/branches/py3k/Modules/_struct.c Tue Nov 30 10:30:54 2010 @@ -6,7 +6,6 @@ #define PY_SSIZE_T_CLEAN #include "Python.h" -#include "structseq.h" #include "structmember.h" #include <ctype.h> Modified: python/branches/py3k/Modules/grpmodule.c ============================================================================== --- python/branches/py3k/Modules/grpmodule.c (original) +++ python/branches/py3k/Modules/grpmodule.c Tue Nov 30 10:30:54 2010 @@ -2,7 +2,6 @@ /* UNIX group file access module */ #include "Python.h" -#include "structseq.h" #include <sys/types.h> #include <grp.h> Modified: python/branches/py3k/Modules/posixmodule.c ============================================================================== --- python/branches/py3k/Modules/posixmodule.c (original) +++ python/branches/py3k/Modules/posixmodule.c Tue Nov 30 10:30:54 2010 @@ -28,7 +28,6 @@ #define PY_SSIZE_T_CLEAN #include "Python.h" -#include "structseq.h" #if defined(__VMS) # include <unixio.h> Modified: python/branches/py3k/Modules/pwdmodule.c ============================================================================== --- python/branches/py3k/Modules/pwdmodule.c (original) +++ python/branches/py3k/Modules/pwdmodule.c Tue Nov 30 10:30:54 2010 @@ -2,7 +2,6 @@ /* UNIX password file access module */ #include "Python.h" -#include "structseq.h" #include <sys/types.h> #include <pwd.h> Modified: python/branches/py3k/Modules/resource.c ============================================================================== --- python/branches/py3k/Modules/resource.c (original) +++ python/branches/py3k/Modules/resource.c Tue Nov 30 10:30:54 2010 @@ -1,6 +1,5 @@ #include "Python.h" -#include "structseq.h" #include <sys/resource.h> #include <sys/time.h> #include <string.h> Modified: python/branches/py3k/Modules/spwdmodule.c ============================================================================== --- python/branches/py3k/Modules/spwdmodule.c (original) +++ python/branches/py3k/Modules/spwdmodule.c Tue Nov 30 10:30:54 2010 @@ -4,7 +4,6 @@ /* For info also see http://www.unixpapa.com/incnote/passwd.html */ #include "Python.h" -#include "structseq.h" #include <sys/types.h> #ifdef HAVE_SHADOW_H Modified: python/branches/py3k/Modules/timemodule.c ============================================================================== --- python/branches/py3k/Modules/timemodule.c (original) +++ python/branches/py3k/Modules/timemodule.c Tue Nov 30 10:30:54 2010 @@ -2,7 +2,6 @@ /* Time module */ #include "Python.h" -#include "structseq.h" #include "_time.h" #define TZNAME_ENCODING "utf-8" Modified: python/branches/py3k/Objects/floatobject.c ============================================================================== --- python/branches/py3k/Objects/floatobject.c (original) +++ python/branches/py3k/Objects/floatobject.c Tue Nov 30 10:30:54 2010 @@ -5,7 +5,6 @@ for any kind of float exception without losing portability. */ #include "Python.h" -#include "structseq.h" #include <ctype.h> #include <float.h> Modified: python/branches/py3k/Objects/longobject.c ============================================================================== --- python/branches/py3k/Objects/longobject.c (original) +++ python/branches/py3k/Objects/longobject.c Tue Nov 30 10:30:54 2010 @@ -4,7 +4,6 @@ #include "Python.h" #include "longintrepr.h" -#include "structseq.h" #include <float.h> #include <ctype.h> Modified: python/branches/py3k/Objects/structseq.c ============================================================================== --- python/branches/py3k/Objects/structseq.c (original) +++ python/branches/py3k/Objects/structseq.c Tue Nov 30 10:30:54 2010 @@ -3,7 +3,6 @@ #include "Python.h" #include "structmember.h" -#include "structseq.h" static char visible_length_key[] = "n_sequence_fields"; static char real_length_key[] = "n_fields"; Modified: python/branches/py3k/Python/sysmodule.c ============================================================================== --- python/branches/py3k/Python/sysmodule.c (original) +++ python/branches/py3k/Python/sysmodule.c Tue Nov 30 10:30:54 2010 @@ -15,7 +15,6 @@ */ #include "Python.h" -#include "structseq.h" #include "code.h" #include "frameobject.h" #include "eval.h"

1 0

r86882 - python/branches/py3k/Doc/tutorial/stdlib.rst
by georg.brandl Nov. 30, 2010

Nov. 30, 2010

Author: georg.brandl Date: Tue Nov 30 09:20:16 2010 New Revision: 86882 Log: Fix input type for zlib. Modified: python/branches/py3k/Doc/tutorial/stdlib.rst Modified: python/branches/py3k/Doc/tutorial/stdlib.rst ============================================================================== --- python/branches/py3k/Doc/tutorial/stdlib.rst (original) +++ python/branches/py3k/Doc/tutorial/stdlib.rst Tue Nov 30 09:20:16 2010 @@ -207,14 +207,14 @@ :mod:`tarfile`. :: >>> import zlib - >>> s = 'witch which has which witches wrist watch' + >>> s = b'witch which has which witches wrist watch' >>> len(s) 41 >>> t = zlib.compress(s) >>> len(t) 37 >>> zlib.decompress(t) - 'witch which has which witches wrist watch' + b'witch which has which witches wrist watch' >>> zlib.crc32(s) 226805979

1 0

r86881 - python/branches/py3k/Doc/library/zipfile.rst
by georg.brandl Nov. 30, 2010

Nov. 30, 2010

Author: georg.brandl Date: Tue Nov 30 08:43:28 2010 New Revision: 86881 Log: #10584: fix bad links. Modified: python/branches/py3k/Doc/library/zipfile.rst Modified: python/branches/py3k/Doc/library/zipfile.rst ============================================================================== --- python/branches/py3k/Doc/library/zipfile.rst (original) +++ python/branches/py3k/Doc/library/zipfile.rst Tue Nov 30 08:43:28 2010 @@ -178,8 +178,8 @@ .. note:: The file-like object is read-only and provides the following methods: - :meth:`read`, :meth:`readline`, :meth:`readlines`, :meth:`__iter__`, - :meth:`__next__`. + :meth:`!read`, :meth:`!readline`, :meth:`!readlines`, :meth:`!__iter__`, + :meth:`!__next__`. .. note::

1 0

r86880 - in python/branches/py3k: Doc/library/functools.rst Doc/whatsnew/3.2.rst Lib/functools.py
by raymond.hettinger Nov. 30, 2010

Nov. 30, 2010

Author: raymond.hettinger Date: Tue Nov 30 08:13:04 2010 New Revision: 86880 Log: Neaten-up a bit. Modified: python/branches/py3k/Doc/library/functools.rst python/branches/py3k/Doc/whatsnew/3.2.rst python/branches/py3k/Lib/functools.py Modified: python/branches/py3k/Doc/library/functools.rst ============================================================================== --- python/branches/py3k/Doc/library/functools.rst (original) +++ python/branches/py3k/Doc/library/functools.rst Tue Nov 30 08:13:04 2010 @@ -72,10 +72,10 @@ A `LRU (least recently used) cache <http://en.wikipedia.org/wiki/Cache_algorithms#Least_Recently_Used>`_ - is indicated when the pattern of calls changes over time, such as - when more recent calls are the best predictors of upcoming calls + works best when more recent calls are the best predictors of upcoming calls (for example, the most popular articles on a news server tend to - change every day). + change each day). The cache's size limit assurs that caching does not + grow without bound on long-running processes such as web servers. .. versionadded:: 3.2 Modified: python/branches/py3k/Doc/whatsnew/3.2.rst ============================================================================== --- python/branches/py3k/Doc/whatsnew/3.2.rst (original) +++ python/branches/py3k/Doc/whatsnew/3.2.rst Tue Nov 30 08:13:04 2010 @@ -332,15 +332,13 @@ c.execute('SELECT phonenumber FROM phonelist WHERE name=?', (name,)) return c.fetchone()[0] - XXX: update for Issue 10586 changes to cache statistics API - To help with choosing an effective cache size, the wrapped function is - instrumented with two attributes *cache_hits* and *cache_misses*: + instrumented with info function: >>> for name in user_requests: ... get_phone_number(name) - >>> print(get_phone_number.cache_hits, get_phone_number.cache_misses) - 4805 980 + >>> get_phone_number.cache_info() + CacheInfo(maxsize=300, size=300, hits=4805, misses=980) If the phonelist table gets updated, the outdated contents of the cache can be cleared with: Modified: python/branches/py3k/Lib/functools.py ============================================================================== --- python/branches/py3k/Lib/functools.py (original) +++ python/branches/py3k/Lib/functools.py Tue Nov 30 08:13:04 2010 @@ -121,16 +121,15 @@ Arguments to the cached function must be hashable. - Significant statistics (maxsize, size, hits, misses) are - available through the f.cache_info() named tuple. - Clear the cache and statistics using f.cache_clear(). - The underlying function is stored in f.__wrapped__. + View the cache statistics named tuple (maxsize, size, hits, misses) with + f.cache_info(). Clear the cache and statistics with f.cache_clear(). + And access the underlying function with f.__wrapped__. See: http://en.wikipedia.org/wiki/Cache_algorithms#Least_Recently_Used """ # Users should only access the lru_cache through its public API: - # cache_info, cache_clear, and f.__wrapped__ + # cache_info, cache_clear, and f.__wrapped__ # The internals of the lru_cache are encapsulated for thread safety and # to allow the implementation to change (including a possible C version). @@ -141,7 +140,7 @@ cache_popitem = cache.popitem cache_renew = cache.move_to_end hits = misses = 0 - kwd_mark = object() # separate positional and keyword args + kwd_mark = object() # separates positional and keyword args lock = Lock() @wraps(user_function) @@ -165,7 +164,7 @@ return result def cache_info(): - """Report significant cache statistics""" + """Report cache statistics""" with lock: return _CacheInfo(maxsize, len(cache), hits, misses)

1 0

r86879 - in python/branches/py3k/Lib: inspect.py test/test_inspect.py
by nick.coghlan Nov. 30, 2010

Nov. 30, 2010

Author: nick.coghlan Date: Tue Nov 30 07:36:04 2010 New Revision: 86879 Log: Issue 10220: switch to using string constants rather than integers for inspect.getgeneratorstate() return values and make debugging friendly str() and repr() for generator states a requirement in the test suite Modified: python/branches/py3k/Lib/inspect.py python/branches/py3k/Lib/test/test_inspect.py Modified: python/branches/py3k/Lib/inspect.py ============================================================================== --- python/branches/py3k/Lib/inspect.py (original) +++ python/branches/py3k/Lib/inspect.py Tue Nov 30 07:36:04 2010 @@ -1130,7 +1130,10 @@ raise AttributeError(attr) -GEN_CREATED, GEN_RUNNING, GEN_SUSPENDED, GEN_CLOSED = range(4) +GEN_CREATED = 'GEN_CREATED' +GEN_RUNNING = 'GEN_RUNNING' +GEN_SUSPENDED = 'GEN_SUSPENDED' +GEN_CLOSED = 'GEN_CLOSED' def getgeneratorstate(generator): """Get current state of a generator-iterator. Modified: python/branches/py3k/Lib/test/test_inspect.py ============================================================================== --- python/branches/py3k/Lib/test/test_inspect.py (original) +++ python/branches/py3k/Lib/test/test_inspect.py Tue Nov 30 07:36:04 2010 @@ -931,6 +931,14 @@ # Running after the first yield next(self.generator) + def test_easy_debugging(self): + # repr() and str() of a generator state should contain the state name + names = 'GEN_CREATED GEN_RUNNING GEN_SUSPENDED GEN_CLOSED'.split() + for name in names: + state = getattr(inspect, name) + self.assertIn(name, repr(state)) + self.assertIn(name, str(state)) + def test_main(): run_unittest(

1 0

r86878 - in python/branches/py3k: Doc/library/functools.rst Doc/whatsnew/3.2.rst Lib/functools.py Lib/test/test_functools.py Misc/NEWS
by nick.coghlan Nov. 30, 2010

Nov. 30, 2010

Author: nick.coghlan Date: Tue Nov 30 07:19:46 2010 New Revision: 86878 Log: Issue 10586: change the new functools.lru_cache implementation to expose the maximum and current cache sizes through the public statistics API. This API is now a single function that returns a named tuple. Modified: python/branches/py3k/Doc/library/functools.rst python/branches/py3k/Doc/whatsnew/3.2.rst python/branches/py3k/Lib/functools.py python/branches/py3k/Lib/test/test_functools.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Doc/library/functools.rst ============================================================================== --- python/branches/py3k/Doc/library/functools.rst (original) +++ python/branches/py3k/Doc/library/functools.rst Tue Nov 30 07:19:46 2010 @@ -52,10 +52,16 @@ results, the positional and keyword arguments to the function must be hashable. - The wrapped function is instrumented with two attributes, :attr:`cache_hits` - and :attr:`cache_misses` which count the number of successful or unsuccessful - cache lookups. These statistics are helpful for tuning the *maxsize* - parameter and for measuring the cache's effectiveness. + The wrapped function is instrumented with a :attr:`cache_info` attribute that + can be called to retrieve a named tuple with the following fields: + + - :attr:`maxsize`: maximum cache size (as set by the *maxsize* parameter) + - :attr:`size`: current number of entries in the cache + - :attr:`hits`: number of successful cache lookups + - :attr:`misses`: number of unsuccessful cache lookups. + + These statistics are helpful for tuning the *maxsize* parameter and for measuring + the effectiveness of the cache. The wrapped function also has a :attr:`cache_clear` attribute which can be called (with no arguments) to clear the cache. Modified: python/branches/py3k/Doc/whatsnew/3.2.rst ============================================================================== --- python/branches/py3k/Doc/whatsnew/3.2.rst (original) +++ python/branches/py3k/Doc/whatsnew/3.2.rst Tue Nov 30 07:19:46 2010 @@ -332,6 +332,8 @@ c.execute('SELECT phonenumber FROM phonelist WHERE name=?', (name,)) return c.fetchone()[0] + XXX: update for Issue 10586 changes to cache statistics API + To help with choosing an effective cache size, the wrapped function is instrumented with two attributes *cache_hits* and *cache_misses*: Modified: python/branches/py3k/Lib/functools.py ============================================================================== --- python/branches/py3k/Lib/functools.py (original) +++ python/branches/py3k/Lib/functools.py Tue Nov 30 07:19:46 2010 @@ -12,7 +12,7 @@ 'total_ordering', 'cmp_to_key', 'lru_cache', 'reduce', 'partial'] from _functools import partial, reduce -from collections import OrderedDict +from collections import OrderedDict, namedtuple try: from _thread import allocate_lock as Lock except: @@ -114,12 +114,15 @@ raise TypeError('hash not implemented') return K +_CacheInfo = namedtuple("CacheInfo", "maxsize, size, hits, misses") + def lru_cache(maxsize=100): """Least-recently-used cache decorator. Arguments to the cached function must be hashable. - Performance statistics stored in f.cache_hits and f.cache_misses. + Significant statistics (maxsize, size, hits, misses) are + available through the f.cache_info() named tuple. Clear the cache and statistics using f.cache_clear(). The underlying function is stored in f.__wrapped__. @@ -127,7 +130,7 @@ """ # Users should only access the lru_cache through its public API: - # cache_hits, cache_misses, cache_clear(), and __wrapped__ + # cache_info, cache_clear, and f.__wrapped__ # The internals of the lru_cache are encapsulated for thread safety and # to allow the implementation to change (including a possible C version). @@ -137,11 +140,13 @@ cache = OrderedDict() # ordered least recent to most recent cache_popitem = cache.popitem cache_renew = cache.move_to_end + hits = misses = 0 kwd_mark = object() # separate positional and keyword args lock = Lock() @wraps(user_function) def wrapper(*args, **kwds): + nonlocal hits, misses key = args if kwds: key += (kwd_mark,) + tuple(sorted(kwds.items())) @@ -149,23 +154,29 @@ with lock: result = cache[key] cache_renew(key) # record recent use of this key - wrapper.cache_hits += 1 + hits += 1 except KeyError: result = user_function(*args, **kwds) with lock: cache[key] = result # record recent use of this key - wrapper.cache_misses += 1 + misses += 1 if len(cache) > maxsize: cache_popitem(0) # purge least recently used cache entry return result + def cache_info(): + """Report significant cache statistics""" + with lock: + return _CacheInfo(maxsize, len(cache), hits, misses) + def cache_clear(): """Clear the cache and cache statistics""" + nonlocal hits, misses with lock: cache.clear() - wrapper.cache_hits = wrapper.cache_misses = 0 + hits = misses = 0 - wrapper.cache_hits = wrapper.cache_misses = 0 + wrapper.cache_info = cache_info wrapper.cache_clear = cache_clear return wrapper Modified: python/branches/py3k/Lib/test/test_functools.py ============================================================================== --- python/branches/py3k/Lib/test/test_functools.py (original) +++ python/branches/py3k/Lib/test/test_functools.py Tue Nov 30 07:19:46 2010 @@ -501,6 +501,11 @@ def orig(x, y): return 3*x+y f = functools.lru_cache(maxsize=20)(orig) + maxsize, currsize, hits, misses = f.cache_info() + self.assertEqual(maxsize, 20) + self.assertEqual(currsize, 0) + self.assertEqual(hits, 0) + self.assertEqual(misses, 0) domain = range(5) for i in range(1000): @@ -508,21 +513,29 @@ actual = f(x, y) expected = orig(x, y) self.assertEqual(actual, expected) - self.assertTrue(f.cache_hits > f.cache_misses) - self.assertEqual(f.cache_hits + f.cache_misses, 1000) + maxsize, currsize, hits, misses = f.cache_info() + self.assertTrue(hits > misses) + self.assertEqual(hits + misses, 1000) + self.assertEqual(currsize, 20) f.cache_clear() # test clearing - self.assertEqual(f.cache_hits, 0) - self.assertEqual(f.cache_misses, 0) + maxsize, currsize, hits, misses = f.cache_info() + self.assertEqual(hits, 0) + self.assertEqual(misses, 0) + self.assertEqual(currsize, 0) f(x, y) - self.assertEqual(f.cache_hits, 0) - self.assertEqual(f.cache_misses, 1) + maxsize, currsize, hits, misses = f.cache_info() + self.assertEqual(hits, 0) + self.assertEqual(misses, 1) + self.assertEqual(currsize, 1) # Test bypassing the cache self.assertIs(f.__wrapped__, orig) f.__wrapped__(x, y) - self.assertEqual(f.cache_hits, 0) - self.assertEqual(f.cache_misses, 1) + maxsize, currsize, hits, misses = f.cache_info() + self.assertEqual(hits, 0) + self.assertEqual(misses, 1) + self.assertEqual(currsize, 1) # test size zero (which means "never-cache") @functools.lru_cache(0) @@ -530,10 +543,15 @@ nonlocal f_cnt f_cnt += 1 return 20 + self.assertEqual(f.cache_info().maxsize, 0) f_cnt = 0 for i in range(5): self.assertEqual(f(), 20) self.assertEqual(f_cnt, 5) + maxsize, currsize, hits, misses = f.cache_info() + self.assertEqual(hits, 0) + self.assertEqual(misses, 5) + self.assertEqual(currsize, 0) # test size one @functools.lru_cache(1) @@ -541,10 +559,15 @@ nonlocal f_cnt f_cnt += 1 return 20 + self.assertEqual(f.cache_info().maxsize, 1) f_cnt = 0 for i in range(5): self.assertEqual(f(), 20) self.assertEqual(f_cnt, 1) + maxsize, currsize, hits, misses = f.cache_info() + self.assertEqual(hits, 4) + self.assertEqual(misses, 1) + self.assertEqual(currsize, 1) # test size two @functools.lru_cache(2) @@ -552,11 +575,16 @@ nonlocal f_cnt f_cnt += 1 return x*10 + self.assertEqual(f.cache_info().maxsize, 2) f_cnt = 0 for x in 7, 9, 7, 9, 7, 9, 8, 8, 8, 9, 9, 9, 8, 8, 8, 7: # * * * * self.assertEqual(f(x), x*10) self.assertEqual(f_cnt, 4) + maxsize, currsize, hits, misses = f.cache_info() + self.assertEqual(hits, 12) + self.assertEqual(misses, 4) + self.assertEqual(currsize, 2) def test_main(verbose=None): test_classes = ( Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Tue Nov 30 07:19:46 2010 @@ -43,6 +43,9 @@ Library ------- +- Issue #10586: The statistics API for the new functools.lru_cache has + been changed to a single cache_info() method returning a named tuple. + - Issue #10323: itertools.islice() now consumes the minimum number of inputs before stopping. Formerly, the final state of the underlying iterator was undefined.

1 0