Mailman 3 July 2006 - Python-checkins

r50969 - in python/trunk: Include/pyerrors.h Misc/NEWS Modules/_struct.c Python/errors.c
by neal.norwitz 04 Aug '06

04 Aug '06

Author: neal.norwitz Date: Sun Jul 30 08:55:48 2006 New Revision: 50969 Modified: python/trunk/Include/pyerrors.h python/trunk/Misc/NEWS python/trunk/Modules/_struct.c python/trunk/Python/errors.c Log: Add PyErr_WarnEx() so C code can pass the stacklevel to warnings.warn(). This provides the proper warning for struct.pack(). PyErr_Warn() is now deprecated in favor of PyErr_WarnEx(). As mentioned by Tim Peters on python-dev. Modified: python/trunk/Include/pyerrors.h ============================================================================== --- python/trunk/Include/pyerrors.h (original) +++ python/trunk/Include/pyerrors.h Sun Jul 30 08:55:48 2006 @@ -225,10 +225,14 @@ PyAPI_FUNC(void) PyErr_WriteUnraisable(PyObject *); /* Issue a warning or exception */ -PyAPI_FUNC(int) PyErr_Warn(PyObject *, char *); +PyAPI_FUNC(int) PyErr_WarnEx(PyObject *category, const char *msg, + Py_ssize_t stack_level); PyAPI_FUNC(int) PyErr_WarnExplicit(PyObject *, const char *, const char *, int, const char *, PyObject *); +/* PyErr_Warn is only for backwards compatability and will be removed. + Use PyErr_WarnEx instead. */ +#define PyErr_Warn(category, msg) PyErr_WarnEx(category, msg, 1) /* In sigcheck.c or signalmodule.c */ PyAPI_FUNC(int) PyErr_CheckSignals(void); Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Sun Jul 30 08:55:48 2006 @@ -12,6 +12,10 @@ Core and builtins ----------------- +- Add PyErr_WarnEx() so C code can pass the stacklevel to warnings.warn(). + This provides the proper warning for struct.pack(). + PyErr_Warn() is now deprecated in favor of PyErr_WarnEx(). + - Patch #1531113: Fix augmented assignment with yield expressions. Also fix a SystemError when trying to assign to yield expressions. Modified: python/trunk/Modules/_struct.c ============================================================================== --- python/trunk/Modules/_struct.c (original) +++ python/trunk/Modules/_struct.c Sun Jul 30 08:55:48 2006 @@ -214,6 +214,8 @@ /* Helper routine to get a Python integer and raise the appropriate error if it isn't one */ +#define INT_OVERFLOW "struct integer overflow masking is deprecated" + static int get_wrapped_long(PyObject *v, long *p) { @@ -223,7 +225,7 @@ PyObject *wrapped; long x; PyErr_Clear(); - if (PyErr_Warn(PyExc_DeprecationWarning, "struct integer overflow masking is deprecated") < 0) + if (PyErr_WarnEx(PyExc_DeprecationWarning, INT_OVERFLOW, 2) < 0) return -1; wrapped = PyNumber_And(v, pylong_ulong_mask); if (wrapped == NULL) @@ -250,7 +252,7 @@ wrapped = PyNumber_And(v, pylong_ulong_mask); if (wrapped == NULL) return -1; - if (PyErr_Warn(PyExc_DeprecationWarning, "struct integer overflow masking is deprecated") < 0) { + if (PyErr_WarnEx(PyExc_DeprecationWarning, INT_OVERFLOW, 2) < 0) { Py_DECREF(wrapped); return -1; } @@ -345,8 +347,8 @@ Py_XDECREF(ptraceback); if (msg == NULL) return -1; - rval = PyErr_Warn(PyExc_DeprecationWarning, - PyString_AS_STRING(msg)); + rval = PyErr_WarnEx(PyExc_DeprecationWarning, + PyString_AS_STRING(msg), 2); Py_DECREF(msg); if (rval == 0) return 0; Modified: python/trunk/Python/errors.c ============================================================================== --- python/trunk/Python/errors.c (original) +++ python/trunk/Python/errors.c Sun Jul 30 08:55:48 2006 @@ -632,7 +632,7 @@ /* Function to issue a warning message; may raise an exception. */ int -PyErr_Warn(PyObject *category, char *message) +PyErr_WarnEx(PyObject *category, const char *message, Py_ssize_t stack_level) { PyObject *dict, *func = NULL; PyObject *warnings_module = PyModule_GetWarningsModule(); @@ -650,7 +650,8 @@ if (category == NULL) category = PyExc_RuntimeWarning; - res = PyObject_CallFunction(func, "sO", message, category); + res = PyObject_CallFunction(func, "sOn", + message, category, stack_level); if (res == NULL) return -1; Py_DECREF(res); @@ -658,6 +659,16 @@ } } +/* PyErr_Warn is only for backwards compatability and will be removed. + Use PyErr_WarnEx instead. */ + +#undef PyErr_Warn + +int +PyErr_Warn(PyObject *category, char *message) +{ + return PyErr_WarnEx(category, message, 1); +} /* Warning with explicit origin */ int

4 5

r50978 - in python/trunk: Lib/distutils/__init__.py Misc/NEWS
by martin.v.loewis 03 Aug '06

03 Aug '06

Author: martin.v.loewis Date: Sun Jul 30 15:14:05 2006 New Revision: 50978 Modified: python/trunk/Lib/distutils/__init__.py python/trunk/Misc/NEWS Log: Base __version__ on sys.version_info, as distutils is no longer maintained separatedly. Modified: python/trunk/Lib/distutils/__init__.py ============================================================================== --- python/trunk/Lib/distutils/__init__.py (original) +++ python/trunk/Lib/distutils/__init__.py Sun Jul 30 15:14:05 2006 @@ -12,4 +12,6 @@ __revision__ = "$Id$" -__version__ = "2.5.0" +import sys +__version__ = "%d.%d.%d" % sys.version_info[:3] +del sys Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Sun Jul 30 15:14:05 2006 @@ -80,7 +80,8 @@ side effects from one test to the next affect outcomes. ``DocTestFinder`` has been changed to sort the list of tests it returns. -- The distutils version has been changed to 2.5.0. +- The distutils version has been changed to 2.5.0, and are now kept + in sync with sys.version_info[:3]. - Bug #978833: Really close underlying socket in _socketobject.close.

6 15

r51011 - python/branches/bcannon-sandboxing/Objects/trackedmalloc.c
by brett.cannon 01 Aug '06

01 Aug '06

Author: brett.cannon Date: Tue Aug 1 01:31:49 2006 New Revision: 51011 Modified: python/branches/bcannon-sandboxing/Objects/trackedmalloc.c Log: Add PyObject_AdjustMemory(). Modified: python/branches/bcannon-sandboxing/Objects/trackedmalloc.c ============================================================================== --- python/branches/bcannon-sandboxing/Objects/trackedmalloc.c (original) +++ python/branches/bcannon-sandboxing/Objects/trackedmalloc.c Tue Aug 1 01:31:49 2006 @@ -53,6 +53,7 @@ + Completely convert ElementTree. + Add an adjust function to compliment track/untrack for realloc usage (allows for future usage of tracking active object counts) ++ Try other ways of storing info to optimize lookup. */ unsigned long Py_ProcessMemUsage = 0; @@ -145,6 +146,19 @@ } /* + Adjust the amount of memory used for a specific use. + + In place for possible future use where tracking creation and deletion at the + object level is to be adjusted, and thus reallocs should not count towards + either. +*/ +int +PyObject_AdjustMemory(const char *what, size_t nbytes) +{ + return PyObject_TrackMemory(what, nbytes); +} + +/* Stop tracking an anonymous chunk of memory. */ int @@ -225,7 +239,7 @@ #endif } - PyObject_TrackMemory(what, size_delta); + PyObject_AdjustMemory(what, size_delta); return allocated; }

1 0

r51010 - python/branches/bcannon-sandboxing/Objects/trackedmalloc.c
by brett.cannon 01 Aug '06

01 Aug '06

Author: brett.cannon Date: Tue Aug 1 01:28:35 2006 New Revision: 51010 Modified: python/branches/bcannon-sandboxing/Objects/trackedmalloc.c Log: Remove entry from todo list for adding proper Py_TRACK_MEMORY #ifdef checks. Modified: python/branches/bcannon-sandboxing/Objects/trackedmalloc.c ============================================================================== --- python/branches/bcannon-sandboxing/Objects/trackedmalloc.c (original) +++ python/branches/bcannon-sandboxing/Objects/trackedmalloc.c Tue Aug 1 01:28:35 2006 @@ -48,7 +48,6 @@ XXX: + convert over all APIs. -+ add proper Py_TRACK_MEMORY #ifdef protections. + Raise an error during compilation if required functionality (e.g. mallinfo()) not available for tracking memory, even if requested. + Completely convert ElementTree.

1 0

r51009 - in python/branches/bcannon-sandboxing: Include/Python.h Include/objimpl.h Objects/trackedmalloc.c Python/sysmodule.c configure configure.in pyconfig.h.in
by brett.cannon 01 Aug '06

01 Aug '06

Author: brett.cannon Date: Tue Aug 1 01:27:46 2006 New Revision: 51009 Modified: python/branches/bcannon-sandboxing/Include/Python.h python/branches/bcannon-sandboxing/Include/objimpl.h python/branches/bcannon-sandboxing/Objects/trackedmalloc.c python/branches/bcannon-sandboxing/Python/sysmodule.c python/branches/bcannon-sandboxing/configure python/branches/bcannon-sandboxing/configure.in python/branches/bcannon-sandboxing/pyconfig.h.in Log: Add needed #ifdef protections. Modified: python/branches/bcannon-sandboxing/Include/Python.h ============================================================================== --- python/branches/bcannon-sandboxing/Include/Python.h (original) +++ python/branches/bcannon-sandboxing/Include/Python.h Tue Aug 1 01:27:46 2006 @@ -73,6 +73,13 @@ #if defined(PYMALLOC_DEBUG) && !defined(WITH_PYMALLOC) #error "PYMALLOC_DEBUG requires WITH_PYMALLOC" #endif + +#ifdef Py_TRACK_MEMORY +#ifndef HAVE_MALLINFO +#error "Py_TRACK_MEMORY required HAVE_MALLINFO" +#endif /* !HAVE_MALLINFO */ +#endif /* Py_TRACK_MEMORY */ + #include "pymem.h" #include "object.h" Modified: python/branches/bcannon-sandboxing/Include/objimpl.h ============================================================================== --- python/branches/bcannon-sandboxing/Include/objimpl.h (original) +++ python/branches/bcannon-sandboxing/Include/objimpl.h Tue Aug 1 01:27:46 2006 @@ -94,18 +94,20 @@ the object gets initialized via PyObject_{Init, InitVar} after obtaining the raw memory. */ +#ifdef Py_TRACK_MEMORY PyAPI_DATA(unsigned long) Py_ProcessMemUsage; PyAPI_FUNC(PyObject *) Py_MemoryUsage(PyObject *, PyObject *); +PyAPI_FUNC(void *) PyObject_TrackedMalloc(const char *, size_t); +PyAPI_FUNC(void *) PyObject_TrackedRealloc(const char *, void *, size_t); +PyAPI_FUNC(void) PyObject_TrackedFree(const char *, void *); +#endif /* Py_TRACK_MEMORY */ + PyAPI_FUNC(int) PyMalloc_ManagesMemory(void *); PyAPI_FUNC(size_t) PyMalloc_AllocatedSize(void *); PyAPI_FUNC(void *) PyObject_Malloc(size_t); PyAPI_FUNC(void *) PyObject_Realloc(void *, size_t); PyAPI_FUNC(void) PyObject_Free(void *); -PyAPI_FUNC(void *) PyObject_TrackedMalloc(const char *, size_t); -PyAPI_FUNC(void *) PyObject_TrackedRealloc(const char *, void *, size_t); -PyAPI_FUNC(void) PyObject_TrackedFree(const char *, void *); - /* Macros */ #ifdef WITH_PYMALLOC Modified: python/branches/bcannon-sandboxing/Objects/trackedmalloc.c ============================================================================== --- python/branches/bcannon-sandboxing/Objects/trackedmalloc.c (original) +++ python/branches/bcannon-sandboxing/Objects/trackedmalloc.c Tue Aug 1 01:27:46 2006 @@ -1,5 +1,11 @@ #include "Python.h" + +/* Must come after Python.h for pyconfig.h value to be set. */ +#ifdef Py_TRACK_MEMORY + +#ifdef HAVE_MALLINFO #include <malloc.h> +#endif /* Add accountability to memory allocation. @@ -46,6 +52,8 @@ + Raise an error during compilation if required functionality (e.g. mallinfo()) not available for tracking memory, even if requested. + Completely convert ElementTree. ++ Add an adjust function to compliment track/untrack for realloc usage (allows + for future usage of tracking active object counts) */ unsigned long Py_ProcessMemUsage = 0; @@ -161,7 +169,9 @@ void * PyObject_TrackedMalloc(const char *what, size_t nbytes) { +#ifdef HAVE_MALLINFO struct mallinfo before = mallinfo(); +#endif void *allocated = NULL; size_t used = 0; @@ -174,7 +184,9 @@ used = PyMalloc_AllocatedSize(allocated); } else { +#ifdef HAVE_MALLINFO used = mallinfo().uordblks - before.uordblks; +#endif } PyObject_TrackMemory(what, used); @@ -190,7 +202,9 @@ void * PyObject_TrackedRealloc(const char *what, void *to_resize, size_t new_size) { +#ifdef HAVE_MALLINFO struct mallinfo before = mallinfo(); +#endif void *allocated = NULL; size_t size_delta = 0; @@ -207,7 +221,9 @@ size_delta = PyMalloc_AllocatedSize(allocated) - size_delta; } else { +#ifdef HAVE_MALLINFO size_delta = mallinfo().uordblks - before.uordblks; +#endif } PyObject_TrackMemory(what, size_delta); @@ -221,7 +237,9 @@ void PyObject_TrackedFree(const char *what, void *to_free) { +#ifdef HAVE_MALLINFO struct mallinfo before = mallinfo(); +#endif size_t freed = 0; if (PyMalloc_ManagesMemory(to_free)) { @@ -231,8 +249,12 @@ PyObject_Free(to_free); if (!freed) { +#ifdef HAVE_MALLINFO freed = before.uordblks - mallinfo().uordblks; +#endif } PyObject_UntrackMemory(what, freed); } + +#endif /* Py_TRACK_MEMORY */ Modified: python/branches/bcannon-sandboxing/Python/sysmodule.c ============================================================================== --- python/branches/bcannon-sandboxing/Python/sysmodule.c (original) +++ python/branches/bcannon-sandboxing/Python/sysmodule.c Tue Aug 1 01:27:46 2006 @@ -782,7 +782,9 @@ #endif {"settrace", sys_settrace, METH_O, settrace_doc}, {"call_tracing", sys_call_tracing, METH_VARARGS, call_tracing_doc}, +#ifdef Py_TRACK_MEMORY {"memoryusage", Py_MemoryUsage, METH_NOARGS, "XXX"}, +#endif {NULL, NULL} /* sentinel */ }; Modified: python/branches/bcannon-sandboxing/configure ============================================================================== --- python/branches/bcannon-sandboxing/configure (original) +++ python/branches/bcannon-sandboxing/configure Tue Aug 1 01:27:46 2006 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 50891 . +# From configure.in Revision: 50892 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for python 2.5. # @@ -3791,6 +3791,61 @@ echo "${ECHO_T}no" >&6 fi; +echo "$as_me:$LINENO: checking for mallinfo" >&5 +echo $ECHO_N "checking for mallinfo... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <malloc.h> +int +main () +{ +void *x=mallinfo + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + +cat >>confdefs.h <<\_ACEOF +#define HAVE_MALLINFO 1 +_ACEOF + + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + # XXX Shouldn't the code above that fiddles with BASECFLAGS and OPT be # merged with this chunk of code? @@ -13744,7 +13799,6 @@ echo "$as_me:$LINENO: result: $with_doc_strings" >&5 echo "${ECHO_T}$with_doc_strings" >&6 -# Check for Python-specific malloc support echo "$as_me:$LINENO: checking for --with-tsc" >&5 echo $ECHO_N "checking for --with-tsc... $ECHO_C" >&6 Modified: python/branches/bcannon-sandboxing/configure.in ============================================================================== --- python/branches/bcannon-sandboxing/configure.in (original) +++ python/branches/bcannon-sandboxing/configure.in Tue Aug 1 01:27:46 2006 @@ -740,6 +740,13 @@ fi], [AC_MSG_RESULT(no)]) +AC_MSG_CHECKING(for mallinfo) +AC_TRY_COMPILE([#include <malloc.h>], void *x=mallinfo, + AC_DEFINE(HAVE_MALLINFO, 1, Define if you have the 'mallinfo' function.) + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no) +) + # XXX Shouldn't the code above that fiddles with BASECFLAGS and OPT be # merged with this chunk of code? @@ -2171,7 +2178,6 @@ fi AC_MSG_RESULT($with_doc_strings) -# Check for Python-specific malloc support AC_MSG_CHECKING(for --with-tsc) AC_ARG_WITH(tsc, [ --with(out)-tsc enable/disable timestamp counter profile], [ Modified: python/branches/bcannon-sandboxing/pyconfig.h.in ============================================================================== --- python/branches/bcannon-sandboxing/pyconfig.h.in (original) +++ python/branches/bcannon-sandboxing/pyconfig.h.in Tue Aug 1 01:27:46 2006 @@ -326,6 +326,9 @@ /* Define this if you have the makedev macro. */ #undef HAVE_MAKEDEV +/* Define if you have the 'mallinfo' function. */ +#undef HAVE_MALLINFO + /* Define to 1 if you have the `memmove' function. */ #undef HAVE_MEMMOVE

1 0

r51000 - python/trunk/Doc/api/exceptions.tex
by andrew.kuchling 31 Jul '06

31 Jul '06

Author: andrew.kuchling Date: Mon Jul 31 14:39:05 2006 New Revision: 51000 Modified: python/trunk/Doc/api/exceptions.tex Log: Document PyErr_WarnEx. (Bad Neal! No biscuit!) Is the explanation of the 'stacklevel' parameter clear? Please feel free to edit it. I don't have LaTeX installed on this machine, so haven't verified that the markup is correct. Will check tonight, or maybe the automatic doc build will tell me. Modified: python/trunk/Doc/api/exceptions.tex ============================================================================== --- python/trunk/Doc/api/exceptions.tex (original) +++ python/trunk/Doc/api/exceptions.tex Mon Jul 31 14:39:05 2006 @@ -259,10 +259,14 @@ argument. It is mostly for internal use. \end{cfuncdesc} -\begin{cfuncdesc}{int}{PyErr_Warn}{PyObject *category, char *message} +\begin{cfuncdesc}{int}{PyErr_WarnEx}{PyObject *category, char *message, int stacklevel} Issue a warning message. The \var{category} argument is a warning category (see below) or \NULL; the \var{message} argument is a - message string. + message string. \var{stacklevel} is a positive number giving a + number of stack frames; the warning will be issued from the + currently executing line of code in that stack frame. A \var{stacklevel} + of 1 is the function calling \cfunction{PyErr_WarnEx()}, 2 is + the function above that, and so forth. This function normally prints a warning message to \var{sys.stderr}; however, it is also possible that the user has specified that @@ -294,6 +298,16 @@ command line documentation. There is no C API for warning control. \end{cfuncdesc} +\begin{cfuncdesc}{int}{PyErr_Warn}{PyObject *category, char *message} + Issue a warning message. The \var{category} argument is a warning + category (see below) or \NULL; the \var{message} argument is a + message string. The warning will appear to be issued from the function + calling \cfunction{PyErr_Warn()}, equivalent to calling + \cfunction{PyErr_Warn()} with a \var{stacklevel} of 1. + + Deprecated; use \cfunction{PyErr_WarnEx()} instead. +\end{cfuncdesc} + \begin{cfuncdesc}{int}{PyErr_WarnExplicit}{PyObject *category, const char *message, const char *filename, int lineno, const char *module, PyObject *registry}

3 2

buildbot warnings in x86 OpenBSD trunk
by buildbot＠python.org 31 Jul '06

31 Jul '06

The Buildbot has detected a new failure of x86 OpenBSD trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520OpenBSD%2520trunk/builds/1112 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: andrew.kuchling,georg.brandl,skip.montanaro Build Had Warnings: warnings test sincerely, -The Buildbot

1 0

r51008 - python/trunk/Tools/scripts/README
by andrew.kuchling 31 Jul '06

31 Jul '06

Author: andrew.kuchling Date: Mon Jul 31 18:27:57 2006 New Revision: 51008 Modified: python/trunk/Tools/scripts/README Log: Update list of files; fix a typo Modified: python/trunk/Tools/scripts/README ============================================================================== --- python/trunk/Tools/scripts/README (original) +++ python/trunk/Tools/scripts/README Mon Jul 31 18:27:57 2006 @@ -27,7 +27,6 @@ fixnotice.py Fix the copyright notice in source files fixps.py Fix Python scripts' first line (if #!) ftpmirror.py FTP mirror script -gencodec.py Create Python codecs from Unicode mapping files google.py Open a webbrowser with Google. gprof2html.py Transform gprof(1) output into useful HTML. h2py.py Translate #define's into Python assignments @@ -53,14 +52,14 @@ ptags.py Create vi tags file for Python modules pydoc Python documentation browser. pysource.py Find Python source files -redemo.py Basic regular expression demostration facility +redemo.py Basic regular expression demonstration facility reindent.py Change .py files to use 4-space indents. rgrep.py Reverse grep through a file (useful for big logfiles) setup.py Install all scripts listed here. suff.py Sort a list of files by suffix +svneol.py Sets svn:eol-style on all files in directory. texcheck.py Validate Python LaTeX formatting (Raymond Hettinger) texi2html.py Convert GNU texinfo files into HTML -trace.py Trace Python program or function execution treesync.py Synchronize source trees (very ideosyncratic) untabify.py Replace tabs with spaces in argument files which.py Find a program in $PATH

1 0

r51007 - python/trunk/Doc/lib/libre.tex
by andrew.kuchling 31 Jul '06

31 Jul '06

Author: andrew.kuchling Date: Mon Jul 31 18:22:05 2006 New Revision: 51007 Modified: python/trunk/Doc/lib/libre.tex Log: [Bug #848556] Remove \d* from second alternative to avoid exponential case when repeating match Modified: python/trunk/Doc/lib/libre.tex ============================================================================== --- python/trunk/Doc/lib/libre.tex (original) +++ python/trunk/Doc/lib/libre.tex Mon Jul 31 18:22:05 2006 @@ -897,7 +897,7 @@ \lineii{\code{\%d}} {\regexp{[-+]?\e d+}} \lineii{\code{\%e}, \code{\%E}, \code{\%f}, \code{\%g}} - {\regexp{[-+]?(\e d+(\e.\e d*)?|\e d*\e.\e d+)([eE][-+]?\e d+)?}} + {\regexp{[-+]?(\e d+(\e.\e d*)?|\e.\e d+)([eE][-+]?\e d+)?}} \lineii{\code{\%i}} {\regexp{[-+]?(0[xX][\e dA-Fa-f]+|0[0-7]*|\e d+)}} \lineii{\code{\%o}}

1 0

r51006 - python/trunk/Doc/lib/lib.tex python/trunk/Doc/lib/libstdtypes.tex
by andrew.kuchling 31 Jul '06

31 Jul '06

Author: andrew.kuchling Date: Mon Jul 31 18:10:24 2006 New Revision: 51006 Modified: python/trunk/Doc/lib/lib.tex python/trunk/Doc/lib/libstdtypes.tex Log: [Bug #1514540] Instead of putting the standard types in a section, put them in a chapter of their own. This means string methods will now show up in the ToC. (Should the types come before or after the functions+exceptions+constants chapter? I've put them after, for now.) Modified: python/trunk/Doc/lib/lib.tex ============================================================================== --- python/trunk/Doc/lib/lib.tex (original) +++ python/trunk/Doc/lib/lib.tex Mon Jul 31 18:10:24 2006 @@ -71,12 +71,12 @@ % BUILT-INs % ============= -\input{libobjs} % Built-in Types, Exceptions and Functions +\input{libobjs} % Built-in Exceptions and Functions \input{libfuncs} -\input{libstdtypes} \input{libexcs} \input{libconsts} +\input{libstdtypes} % Built-in types % ============= Modified: python/trunk/Doc/lib/libstdtypes.tex ============================================================================== --- python/trunk/Doc/lib/libstdtypes.tex (original) +++ python/trunk/Doc/lib/libstdtypes.tex Mon Jul 31 18:10:24 2006 @@ -1,4 +1,4 @@ -\section{Built-in Types \label{types}} +\chapter{Built-in Types \label{types}} The following sections describe the standard types that are built into the interpreter. @@ -24,7 +24,7 @@ \citetitle[../tut/tut.html]{Python Tutorial}.) -\subsection{Truth Value Testing\label{truth}} +\section{Truth Value Testing\label{truth}} Any object can be tested for truth value, for use in an \keyword{if} or \keyword{while} condition or as operand of the Boolean operations below. @@ -71,7 +71,7 @@ \index{False} \index{True} -\subsection{Boolean Operations --- +\section{Boolean Operations --- \keyword{and}, \keyword{or}, \keyword{not} \label{boolean}} @@ -107,7 +107,7 @@ \end{description} -\subsection{Comparisons \label{comparisons}} +\section{Comparisons \label{comparisons}} Comparison operations are supported by all objects. They all have the same priority (which is higher than that of the Boolean operations). @@ -174,7 +174,7 @@ only by sequence types (below). -\subsection{Numeric Types --- +\section{Numeric Types --- \class{int}, \class{float}, \class{long}, \class{complex} \label{typesnumeric}} @@ -307,7 +307,7 @@ \end{description} % XXXJH exceptions: overflow (when? what operations?) zerodivision -\subsubsection{Bit-string Operations on Integer Types \label{bitstring-ops}} +\subsection{Bit-string Operations on Integer Types \label{bitstring-ops}} \nodename{Bit-string Operations} Plain and long integer types support additional operations that make @@ -350,7 +350,7 @@ \end{description} -\subsection{Iterator Types \label{typeiter}} +\section{Iterator Types \label{typeiter}} \versionadded{2.2} \index{iterator protocol} @@ -414,7 +414,7 @@ supplying the \method{__iter__()} and \method{next()} methods. -\subsection{Sequence Types --- +\section{Sequence Types --- \class{str}, \class{unicode}, \class{list}, \class{tuple}, \class{buffer}, \class{xrange} \label{typesseq}} @@ -566,7 +566,7 @@ \end{description} -\subsubsection{String Methods \label{string-methods}} +\subsection{String Methods \label{string-methods}} \indexii{string}{methods} These are the string methods which both 8-bit strings and Unicode @@ -901,7 +901,7 @@ \end{methoddesc} -\subsubsection{String Formatting Operations \label{typesseq-strings}} +\subsection{String Formatting Operations \label{typesseq-strings}} \index{formatting, string (\%{})} \index{interpolation, string (\%{})} @@ -1072,7 +1072,7 @@ \refmodule{re}.\refstmodindex{re} -\subsubsection{XRange Type \label{typesseq-xrange}} +\subsection{XRange Type \label{typesseq-xrange}} The \class{xrange}\obindex{xrange} type is an immutable sequence which is commonly used for looping. The advantage of the \class{xrange} @@ -1084,7 +1084,7 @@ iteration, and the \function{len()} function. -\subsubsection{Mutable Sequence Types \label{typesseq-mutable}} +\subsection{Mutable Sequence Types \label{typesseq-mutable}} List objects support additional operations that allow in-place modification of the object. @@ -1216,7 +1216,7 @@ that the list has been mutated during a sort. \end{description} -\subsection{Set Types --- +\section{Set Types --- \class{set}, \class{frozenset} \label{types-set}} \obindex{set} @@ -1355,7 +1355,7 @@ \end{seealso} -\subsection{Mapping Types --- \class{dict} \label{typesmapping}} +\section{Mapping Types --- \class{dict} \label{typesmapping}} \obindex{mapping} \obindex{dictionary} @@ -1518,7 +1518,7 @@ \end{description} -\subsection{File Objects +\section{File Objects \label{bltin-file-objects}} File objects\obindex{file} are implemented using C's \code{stdio} @@ -1797,7 +1797,7 @@ \end{memberdesc} -\subsection{Context Manager Types \label{typecontextmanager}} +\section{Context Manager Types \label{typecontextmanager}} \versionadded{2.5} \index{context manager} @@ -1878,13 +1878,13 @@ is negligible. -\subsection{Other Built-in Types \label{typesother}} +\section{Other Built-in Types \label{typesother}} The interpreter supports several other kinds of objects. Most of these support only one or two operations. -\subsubsection{Modules \label{typesmodules}} +\subsection{Modules \label{typesmodules}} The only special operation on a module is attribute access: \code{\var{m}.\var{name}}, where \var{m} is a module and \var{name} @@ -1910,14 +1910,14 @@ '/usr/local/lib/python\shortversion/os.pyc'>}. -\subsubsection{Classes and Class Instances \label{typesobjects}} +\subsection{Classes and Class Instances \label{typesobjects}} \nodename{Classes and Instances} See chapters 3 and 7 of the \citetitle[../ref/ref.html]{Python Reference Manual} for these. -\subsubsection{Functions \label{typesfunctions}} +\subsection{Functions \label{typesfunctions}} Function objects are created by function definitions. The only operation on a function object is to call it: @@ -1931,7 +1931,7 @@ See the \citetitle[../ref/ref.html]{Python Reference Manual} for more information. -\subsubsection{Methods \label{typesmethods}} +\subsection{Methods \label{typesmethods}} \obindex{method} Methods are functions that are called using the attribute notation. @@ -1976,7 +1976,7 @@ information. -\subsubsection{Code Objects \label{bltin-code-objects}} +\subsection{Code Objects \label{bltin-code-objects}} \obindex{code} Code objects are used by the implementation to represent @@ -1999,7 +1999,7 @@ information. -\subsubsection{Type Objects \label{bltin-type-objects}} +\subsection{Type Objects \label{bltin-type-objects}} Type objects represent the various object types. An object's type is accessed by the built-in function \function{type()}. There are no special @@ -2011,7 +2011,7 @@ Types are written like this: \code{<type 'int'>}. -\subsubsection{The Null Object \label{bltin-null-object}} +\subsection{The Null Object \label{bltin-null-object}} This object is returned by functions that don't explicitly return a value. It supports no special operations. There is exactly one null @@ -2020,7 +2020,7 @@ It is written as \code{None}. -\subsubsection{The Ellipsis Object \label{bltin-ellipsis-object}} +\subsection{The Ellipsis Object \label{bltin-ellipsis-object}} This object is used by extended slice notation (see the \citetitle[../ref/ref.html]{Python Reference Manual}). It supports no @@ -2029,7 +2029,7 @@ It is written as \code{Ellipsis}. -\subsubsection{Boolean Values} +\subsection{Boolean Values} Boolean values are the two constant objects \code{False} and \code{True}. They are used to represent truth values (although other @@ -2046,14 +2046,14 @@ \indexii{Boolean}{values} -\subsubsection{Internal Objects \label{typesinternal}} +\subsection{Internal Objects \label{typesinternal}} See the \citetitle[../ref/ref.html]{Python Reference Manual} for this information. It describes stack frame objects, traceback objects, and slice objects. -\subsection{Special Attributes \label{specialattrs}} +\section{Special Attributes \label{specialattrs}} The implementation adds a few special read-only attributes to several object types, where they are relevant. Some of these are not reported

1 0