Mailman 3 October 2003 - Python-checkins

distutils ANNOUNCE-0.9, 1.1, NONE USAGE.txt, 1.7, NONE
by akuchling＠users.sourceforge.net 23 Oct '03

23 Oct '03

Update of /cvsroot/python/distutils In directory sc8-pr-cvs1:/tmp/cvs-serv14356 Removed Files: ANNOUNCE-0.9 USAGE.txt Log Message: Remove obsolete files --- ANNOUNCE-0.9 DELETED --- --- USAGE.txt DELETED ---

1 0

distutils setup.py,1.32,1.33
by akuchling＠users.sourceforge.net 23 Oct '03

23 Oct '03

Update of /cvsroot/python/distutils In directory sc8-pr-cvs1:/tmp/cvs-serv14069 Modified Files: setup.py Log Message: Bump version number; update my e-mail address Index: setup.py =================================================================== RCS file: /cvsroot/python/distutils/setup.py,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** setup.py 19 Nov 2002 14:29:35 -0000 1.32 --- setup.py 23 Oct 2003 01:20:21 -0000 1.33 *************** *** 10,19 **** setup (name = "Distutils", ! version = "1.0.3", description = "Python Distribution Utilities", author = "Greg Ward", author_email = "gward(a)python.net", maintainer = "A.M. Kuchling", ! maintainer_email = 'amk1(a)bigfoot.com', url = "http://www.python.org/sigs/distutils-sig/", licence = "Python", --- 10,19 ---- setup (name = "Distutils", ! version = "1.1", description = "Python Distribution Utilities", author = "Greg Ward", author_email = "gward(a)python.net", maintainer = "A.M. Kuchling", ! maintainer_email = 'amk(a)amk.ca', url = "http://www.python.org/sigs/distutils-sig/", licence = "Python", *************** *** 21,25 **** A collection of modules to aid in the distribution and installation of Python modules, extensions, and (ultimately) applications. A standard ! part of Python 1.6 and 2.0, but also distributed separately for use with Python 1.5.""", --- 21,25 ---- A collection of modules to aid in the distribution and installation of Python modules, extensions, and (ultimately) applications. A standard ! part of Python 2.x, but also distributed separately for use with Python 1.5.""",

1 0

python/nondist/peps pep-0289.txt,1.3,1.4
by rhettinger＠users.sourceforge.net 22 Oct '03

22 Oct '03

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1:/tmp/cvs-serv13831 Modified Files: pep-0289.txt Log Message: * Remove claim to minimize use of reduce() * Add claim to minimize use of lambda. * Remove details of proposed new accumulator functions. * Reference Jeff Epler's proof-of-concept patch. * Minor wording improvements everywhere. Index: pep-0289.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0289.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pep-0289.txt 22 Oct 2003 18:09:36 -0000 1.3 --- pep-0289.txt 22 Oct 2003 22:08:06 -0000 1.4 *************** *** 44,56 **** d = dict( (k, func(v)) for k in keylist) ! Generator expressions are especially useful in functions that reduce ! an iterable input to a single value:: ! sum(len(line) for line in file if line.strip()) ! Accordingly, generator expressions are expected to partially eliminate ! the need for reduce() which is notorious for its lack of clarity. And, ! there are additional speed and clarity benefits from writing expressions ! directly instead of using lambda. List comprehensions greatly reduced the need for filter() and map(). --- 44,62 ---- d = dict( (k, func(v)) for k in keylist) ! Generator expressions are especially useful with functions like sum(), ! min(), and max() that reduce an iterable input to a single value:: ! max(len(line) for line in file if line.strip()) ! Generator expressions also address some examples of functionals coded ! with lambda:: ! ! reduce(lambda s, a: s + a.myattr, data, 0) ! reduce(lambda s, a: s + a[3], data, 0) ! ! These simplify to:: ! ! sum(a.myattr for a in data) ! sum(a[3] for a in data) List comprehensions greatly reduced the need for filter() and map(). *************** *** 77,87 **** ! The Gory Details ! ================ 1. The semantics of a generator expression are equivalent to creating an anonymous generator function and calling it. There's still discussion ! about whether that generator function should copy the current value of all ! free variables into default arguments. 2. The syntax requires that a generator expression always needs to be inside --- 83,93 ---- ! The Details ! =========== 1. The semantics of a generator expression are equivalent to creating an anonymous generator function and calling it. There's still discussion ! about whether that generator function should copy the current value of ! all free variables into default arguments. 2. The syntax requires that a generator expression always needs to be inside *************** *** 136,228 **** The utility of generator expressions is greatly enhanced when combined ! with appropriate reduction functions like sum(), min(), and max(). I ! propose creating a set of high speed reduction functions designed to tap the ! power of generator expressions and replace the most common uses of reduce():: ! ! def xorsum(it): ! return reduce(operator.xor, it, 0) ! ! def product(it): ! return reduce(operator.mul, it, 1) ! ! def anytrue(it): ! for elem in it: ! if it: ! return True ! return False ! ! def alltrue(it): ! for elem in it: ! if it: ! return False ! return True ! ! def horner(it, x): ! 'horner([6,3,4], 5) evaluates 6*x**2 + 3*x + 4 at x=5' ! cum = 0.0 ! for c in it: ! cum = cum*x + c ! return cum ! ! def mean(it): ! data = list(it) ! return sum(data) / len(data) ! ! def smallest(it, siz=1): ! result = [] ! for elem in it: ! if len(result) < siz: ! bisect.insort_left(result, elem) ! elif elem < result[-1]: ! result.pop() ! bisect.insort_left(result, elem) ! return result ! ! def largest(it, siz=1): ! result = [] ! for elem in it: ! if len(result) < siz: ! bisect.insort_left(result, elem) ! elif elem > result[0]: ! result.pop(0) ! bisect.insort_left(result, elem) ! result.reverse() ! return result ! ! Notes on reduce() ! ================= ! ! Reduce typically has three types of use cases: ! ! 1) Common reduction functions applied directly to elements in a sequence. ! This use case is addressed by the sum(), min(), max(), and the additional ! functions listed above. ! ! 2) Reduce is often used with lambda when the data needs be extracted from ! complex sequence elements. For example:: ! ! reduce(lambda sum, x: sum + x.myattr, data, 0) ! reduce(lambda prod, x: prod * x[3], data, 1) ! ! In concert with reduction functions, generator expressions completely ! fulfill these use cases:: ! ! sum(x.myattr for x in data) ! product(x[3] for x in data) ! ! 3) On rare occasions, the reduction function is non-standard and requires ! custom coding:: ! ! reduce(lambda cum, c: (cum >> 8) ^ crc32[ord(a) ^ (cum & 0x00ff)], data, -1) ! ! Because a complex lambda is required, this use case becomes clearer and ! faster when coded directly as a for-loop:: ! ! cum = -1 ! for c in data: ! cum = (cum >> 8) ^ crc32[ord(a) ^ (cum & 0x00ff)] ! ! In conclusion, after adding generator expressions and a set of common reduction ! functions, few, if any cases remain for reduce(). --- 142,149 ---- The utility of generator expressions is greatly enhanced when combined ! with reduction functions like sum(), min(), and max(). Separate ! proposals are forthcoming that recommend several new accumulation ! functions possibly including: product(), average(), alltrue(), ! anytrue(), nlargest(), nsmallest(). *************** *** 259,263 **** .. [3] Peter Norvig's Accumulation Display Proposal http:///www.norvig.com/pyacc.html ! Copyright --- 180,187 ---- .. [3] Peter Norvig's Accumulation Display Proposal http:///www.norvig.com/pyacc.html ! ! .. [4] Jeff Epler had worked up a patch demonstrating ! the previously proposed bracket and yield syntax ! http://python.org/sf/795947 Copyright

1 0

python/dist/src/Modules/expat macconfig.h, NONE, 1.1.2.1 asciitab.h, 1.1.1.1, 1.1.1.1.16.1 expat.h, 1.5, 1.5.12.1 iasciitab.h, 1.1.1.1, 1.1.1.1.16.1 internal.h, 1.1, 1.1.14.1 latin1tab.h, 1.1.1.1, 1.1.1.1.16.1 utf8tab.h, 1.1.1.1, 1.1.1.1.16.1 winconfig.h, 1.1.1.1, 1.1.1.1.16.1 xmlparse.c, 1.5, 1.5.12.1 xmlrole.c, 1.5, 1.5.12.1 xmltok.c, 1.3, 1.3.12.1 xmltok_impl.c, 1.2, 1.2.12.1 expat.h.in, 1.1.1.1, NONE
by fdrake＠users.sourceforge.net 22 Oct '03

22 Oct '03

Update of /cvsroot/python/python/dist/src/Modules/expat In directory sc8-pr-cvs1:/tmp/cvs-serv7002 Modified Files: Tag: release23-maint asciitab.h expat.h iasciitab.h internal.h latin1tab.h utf8tab.h winconfig.h xmlparse.c xmlrole.c xmltok.c xmltok_impl.c Added Files: Tag: release23-maint macconfig.h Removed Files: Tag: release23-maint expat.h.in Log Message: Update to Expat 1.95.7; there are no changes to the Expat sources. --- NEW FILE: macconfig.h --- /*================================================================ ** Copyright 2000, Clark Cooper ** All rights reserved. ** ** This is free software. You are permitted to copy, distribute, or modify ** it under the terms of the MIT/X license (contained in the COPYING file ** with this distribution.) ** */ #ifndef MACCONFIG_H #define MACCONFIG_H /* 1234 = LIL_ENDIAN, 4321 = BIGENDIAN */ #define BYTEORDER 4321 /* Define to 1 if you have the `bcopy' function. */ #undef HAVE_BCOPY /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H /* Define to 1 if you have the <fcntl.h> header file. */ #undef HAVE_FCNTL_H /* Define to 1 if you have the `getpagesize' function. */ #undef HAVE_GETPAGESIZE /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H /* Define to 1 if you have the `memmove' function. */ #define HAVE_MEMMOVE /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H /* Define to 1 if you have a working `mmap' system call. */ #undef HAVE_MMAP /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H /* Define to 1 if you have the <stdlib.h> header file. */ #define HAVE_STDLIB_H /* Define to 1 if you have the <strings.h> header file. */ #undef HAVE_STRINGS_H /* Define to 1 if you have the <string.h> header file. */ #define HAVE_STRING_H /* Define to 1 if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H /* Define to 1 if you have the <sys/types.h> header file. */ #undef HAVE_SYS_TYPES_H /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT /* Define to the full name of this package. */ #undef PACKAGE_NAME /* Define to the full name and version of this package. */ #undef PACKAGE_STRING /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME /* Define to the version of this package. */ #undef PACKAGE_VERSION /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS /* whether byteorder is bigendian */ #define WORDS_BIGENDIAN /* Define to specify how much context to retain around the current parse point. */ #undef XML_CONTEXT_BYTES /* Define to make parameter entity parsing functionality available. */ #define XML_DTD /* Define to make XML Namespaces functionality available. */ #define XML_NS /* Define to empty if `const' does not conform to ANSI C. */ #undef const /* Define to `long' if <sys/types.h> does not define. */ #define off_t long /* Define to `unsigned' if <sys/types.h> does not define. */ #undef size_t #endif /* ifndef MACCONFIG_H */ Index: asciitab.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/expat/asciitab.h,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.16.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.16.1 *** asciitab.h 11 Feb 2002 23:13:05 -0000 1.1.1.1 --- asciitab.h 21 Oct 2003 20:02:33 -0000 1.1.1.1.16.1 *************** *** 1,5 **** ! /* ! Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd ! See the file COPYING for copying permission. */ --- 1,4 ---- ! /* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd ! See the file COPYING for copying permission. */ Index: expat.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/expat/expat.h,v retrieving revision 1.5 retrieving revision 1.5.12.1 diff -C2 -d -r1.5 -r1.5.12.1 *** expat.h 7 Feb 2003 02:15:56 -0000 1.5 --- expat.h 21 Oct 2003 20:02:34 -0000 1.5.12.1 *************** *** 17,31 **** #include <stdlib.h> - #ifndef XMLPARSEAPI #if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__) ! #ifdef XML_STATIC ! #define XMLPARSEAPI(type) type __cdecl ! #else ! #define XMLPARSEAPI(type) __declspec(dllimport) type __cdecl #endif #else ! #define XMLPARSEAPI(type) type #endif ! #endif /* not defined XMLPARSEAPI */ #ifdef __cplusplus --- 17,85 ---- #include <stdlib.h> #if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__) ! #define XML_USE_MSC_EXTENSIONS 1 #endif + + /* Expat tries very hard to make the API boundary very specifically + defined. There are two macros defined to control this boundary; + each of these can be defined before including this header to + achieve some different behavior, but doing so it not recommended or + tested frequently. + + XMLCALL - The calling convention to use for all calls across the + "library boundary." This will default to cdecl, and + try really hard to tell the compiler that's what we + want. + + XMLIMPORT - Whatever magic is needed to note that a function is + to be imported from a dynamically loaded library + (.dll, .so, or .sl, depending on your platform). + + The XMLCALL macro was added in Expat 1.95.7. The only one which is + expected to be directly useful in client code is XMLCALL. + + Note that on at least some Unix versions, the Expat library must be + compiled with the cdecl calling convention as the default since + system headers may assume the cdecl convention. + */ + #ifndef XMLCALL + #if defined(XML_USE_MSC_EXTENSIONS) + #define XMLCALL __cdecl + #elif defined(__GNUC__) + #define XMLCALL __attribute__((cdecl)) #else ! /* For any platform which uses this definition and supports more than ! one calling convention, we need to extend this definition to ! declare the convention used on that platform, if it's possible to ! do so. ! ! If this is the case for your platform, please file a bug report ! with information on how to identify your platform via the C ! pre-processor and how to specify the same calling convention as the ! platform's malloc() implementation. ! */ ! #define XMLCALL #endif ! #endif /* not defined XMLCALL */ ! ! ! #if !defined(XML_STATIC) && !defined(XMLIMPORT) ! #ifndef XML_BUILDING_EXPAT ! /* using Expat from an application */ ! ! #ifdef XML_USE_MSC_EXTENSIONS ! #define XMLIMPORT __declspec(dllimport) ! #endif ! ! #endif ! #endif /* not defined XML_STATIC */ ! ! /* If we didn't define it above, define it away: */ ! #ifndef XMLIMPORT ! #define XMLIMPORT ! #endif ! ! ! #define XMLPARSEAPI(type) XMLIMPORT type XMLCALL #ifdef __cplusplus *************** *** 105,109 **** XML_ERROR_ENTITY_DECLARED_IN_PE, XML_ERROR_FEATURE_REQUIRES_XML_DTD, ! XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING }; --- 159,164 ---- XML_ERROR_ENTITY_DECLARED_IN_PE, XML_ERROR_FEATURE_REQUIRES_XML_DTD, ! XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING, ! XML_ERROR_UNBOUND_PREFIX }; *************** *** 157,163 **** to free model when finished with it. */ ! typedef void (*XML_ElementDeclHandler) (void *userData, ! const XML_Char *name, ! XML_Content *model); XMLPARSEAPI(void) --- 212,218 ---- to free model when finished with it. */ ! typedef void (XMLCALL *XML_ElementDeclHandler) (void *userData, ! const XML_Char *name, ! XML_Content *model); XMLPARSEAPI(void) *************** *** 173,182 **** true and default is non-NULL, then this is a "#FIXED" default. */ ! typedef void (*XML_AttlistDeclHandler) (void *userData, ! const XML_Char *elname, ! const XML_Char *attname, ! const XML_Char *att_type, ! const XML_Char *dflt, ! int isrequired); XMLPARSEAPI(void) --- 228,238 ---- true and default is non-NULL, then this is a "#FIXED" default. */ ! typedef void (XMLCALL *XML_AttlistDeclHandler) ( ! void *userData, ! const XML_Char *elname, ! const XML_Char *attname, ! const XML_Char *att_type, ! const XML_Char *dflt, ! int isrequired); XMLPARSEAPI(void) *************** *** 192,199 **** as no, or that it was given as yes. */ ! typedef void (*XML_XmlDeclHandler) (void *userData, ! const XML_Char *version, ! const XML_Char *encoding, ! int standalone); XMLPARSEAPI(void) --- 248,255 ---- as no, or that it was given as yes. */ ! typedef void (XMLCALL *XML_XmlDeclHandler) (void *userData, ! const XML_Char *version, ! const XML_Char *encoding, ! int standalone); XMLPARSEAPI(void) *************** *** 203,209 **** typedef struct { ! void *(*malloc_fcn)(size_t size); ! void *(*realloc_fcn)(void *ptr, size_t size); ! void (*free_fcn)(void *ptr); } XML_Memory_Handling_Suite; --- 259,265 ---- typedef struct { ! void *(XMLCALL *malloc_fcn)(size_t size); ! void *(XMLCALL *realloc_fcn)(void *ptr, size_t size); ! void (XMLCALL *free_fcn)(void *ptr); } XML_Memory_Handling_Suite; *************** *** 258,284 **** names and values are 0 terminated. */ ! typedef void (*XML_StartElementHandler)(void *userData, ! const XML_Char *name, ! const XML_Char **atts); ! typedef void (*XML_EndElementHandler)(void *userData, ! const XML_Char *name); /* s is not 0 terminated. */ ! typedef void (*XML_CharacterDataHandler)(void *userData, ! const XML_Char *s, ! int len); /* target and data are 0 terminated */ ! typedef void (*XML_ProcessingInstructionHandler)(void *userData, ! const XML_Char *target, ! const XML_Char *data); /* data is 0 terminated */ ! typedef void (*XML_CommentHandler)(void *userData, const XML_Char *data); ! typedef void (*XML_StartCdataSectionHandler)(void *userData); ! typedef void (*XML_EndCdataSectionHandler)(void *userData); /* This is called for any characters in the XML document for which --- 314,342 ---- names and values are 0 terminated. */ ! typedef void (XMLCALL *XML_StartElementHandler) (void *userData, ! const XML_Char *name, ! const XML_Char **atts); ! typedef void (XMLCALL *XML_EndElementHandler) (void *userData, ! const XML_Char *name); /* s is not 0 terminated. */ ! typedef void (XMLCALL *XML_CharacterDataHandler) (void *userData, ! const XML_Char *s, ! int len); /* target and data are 0 terminated */ ! typedef void (XMLCALL *XML_ProcessingInstructionHandler) ( ! void *userData, ! const XML_Char *target, ! const XML_Char *data); /* data is 0 terminated */ ! typedef void (XMLCALL *XML_CommentHandler) (void *userData, ! const XML_Char *data); ! typedef void (XMLCALL *XML_StartCdataSectionHandler) (void *userData); ! typedef void (XMLCALL *XML_EndCdataSectionHandler) (void *userData); /* This is called for any characters in the XML document for which *************** *** 295,306 **** multiple calls. */ ! typedef void (*XML_DefaultHandler)(void *userData, ! const XML_Char *s, ! int len); /* This is called for the start of the DOCTYPE declaration, before any DTD or internal subset is parsed. */ ! typedef void (*XML_StartDoctypeDeclHandler)(void *userData, const XML_Char *doctypeName, const XML_Char *sysid, --- 353,365 ---- multiple calls. */ ! typedef void (XMLCALL *XML_DefaultHandler) (void *userData, ! const XML_Char *s, ! int len); /* This is called for the start of the DOCTYPE declaration, before any DTD or internal subset is parsed. */ ! typedef void (XMLCALL *XML_StartDoctypeDeclHandler) ( ! void *userData, const XML_Char *doctypeName, const XML_Char *sysid, *************** *** 312,316 **** subset. */ ! typedef void (*XML_EndDoctypeDeclHandler)(void *userData); /* This is called for entity declarations. The is_parameter_entity --- 371,375 ---- subset. */ ! typedef void (XMLCALL *XML_EndDoctypeDeclHandler)(void *userData); /* This is called for entity declarations. The is_parameter_entity *************** *** 332,344 **** that would break binary compatibility. */ ! typedef void (*XML_EntityDeclHandler) (void *userData, ! const XML_Char *entityName, ! int is_parameter_entity, ! const XML_Char *value, ! int value_length, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId, ! const XML_Char *notationName); XMLPARSEAPI(void) --- 391,404 ---- that would break binary compatibility. */ ! typedef void (XMLCALL *XML_EntityDeclHandler) ( ! void *userData, ! const XML_Char *entityName, ! int is_parameter_entity, ! const XML_Char *value, ! int value_length, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId, ! const XML_Char *notationName); XMLPARSEAPI(void) *************** *** 355,364 **** NULL. The other arguments may be. */ ! typedef void (*XML_UnparsedEntityDeclHandler)(void *userData, ! const XML_Char *entityName, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId, ! const XML_Char *notationName); /* This is called for a declaration of notation. The base argument is --- 415,425 ---- NULL. The other arguments may be. */ ! typedef void (XMLCALL *XML_UnparsedEntityDeclHandler) ( ! void *userData, ! const XML_Char *entityName, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId, ! const XML_Char *notationName); /* This is called for a declaration of notation. The base argument is *************** *** 366,374 **** NULL. The other arguments can be. */ ! typedef void (*XML_NotationDeclHandler)(void *userData, ! const XML_Char *notationName, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId); /* When namespace processing is enabled, these are called once for --- 427,436 ---- NULL. The other arguments can be. */ ! typedef void (XMLCALL *XML_NotationDeclHandler) ( ! void *userData, ! const XML_Char *notationName, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId); /* When namespace processing is enabled, these are called once for *************** *** 378,387 **** NULL. For an xmlns="" attribute, uri will be NULL. */ ! typedef void (*XML_StartNamespaceDeclHandler)(void *userData, ! const XML_Char *prefix, ! const XML_Char *uri); ! typedef void (*XML_EndNamespaceDeclHandler)(void *userData, ! const XML_Char *prefix); /* This is called if the document is not standalone, that is, it has an --- 440,451 ---- NULL. For an xmlns="" attribute, uri will be NULL. */ ! typedef void (XMLCALL *XML_StartNamespaceDeclHandler) ( ! void *userData, ! const XML_Char *prefix, ! const XML_Char *uri); ! typedef void (XMLCALL *XML_EndNamespaceDeclHandler) ( ! void *userData, ! const XML_Char *prefix); /* This is called if the document is not standalone, that is, it has an *************** *** 394,398 **** entity was actually read. */ ! typedef int (*XML_NotStandaloneHandler)(void *userData); /* This is called for a reference to an external parsed general --- 458,462 ---- entity was actually read. */ ! typedef int (XMLCALL *XML_NotStandaloneHandler) (void *userData); /* This is called for a reference to an external parsed general *************** *** 430,438 **** not userData. */ ! typedef int (*XML_ExternalEntityRefHandler)(XML_Parser parser, ! const XML_Char *context, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId); /* This is called in two situations: --- 494,503 ---- not userData. */ ! typedef int (XMLCALL *XML_ExternalEntityRefHandler) ( ! XML_Parser parser, ! const XML_Char *context, ! const XML_Char *base, ! const XML_Char *systemId, ! const XML_Char *publicId); /* This is called in two situations: *************** *** 446,452 **** declarations or attribute values */ ! typedef void (*XML_SkippedEntityHandler)(void *userData, ! const XML_Char *entityName, ! int is_parameter_entity); /* This structure is filled in by the XML_UnknownEncodingHandler to --- 511,518 ---- declarations or attribute values */ ! typedef void (XMLCALL *XML_SkippedEntityHandler) ( ! void *userData, ! const XML_Char *entityName, ! int is_parameter_entity); /* This structure is filled in by the XML_UnknownEncodingHandler to *************** *** 505,510 **** int map[256]; void *data; ! int (*convert)(void *data, const char *s); ! void (*release)(void *data); } XML_Encoding; --- 571,576 ---- int map[256]; void *data; ! int (XMLCALL *convert)(void *data, const char *s); ! void (XMLCALL *release)(void *data); } XML_Encoding; *************** *** 524,530 **** return an XML_UNKNOWN_ENCODING error. */ ! typedef int (*XML_UnknownEncodingHandler)(void *encodingHandlerData, ! const XML_Char *name, ! XML_Encoding *info); XMLPARSEAPI(void) --- 590,597 ---- return an XML_UNKNOWN_ENCODING error. */ ! typedef int (XMLCALL *XML_UnknownEncodingHandler) ( ! void *encodingHandlerData, ! const XML_Char *name, ! XML_Encoding *info); XMLPARSEAPI(void) *************** *** 814,819 **** /* These functions return information about the current parse location. They may be called from any callback called to report ! some parse event; in this case the location is the location of ! the first of the sequence of characters that generated the event. They may also be called after returning from a call to XML_Parse --- 881,891 ---- /* These functions return information about the current parse location. They may be called from any callback called to report ! some parse event; in this case the location is the location of the ! first of the sequence of characters that generated the event. When ! called from callbacks generated by declarations in the document ! prologue, the location identified isn't as neatly defined, but will ! be within the relevant markup. When called outside of the callback ! functions, the position indicated will be just past the last parse ! event (regardless of whether there was an associated callback). They may also be called after returning from a call to XML_Parse *************** *** 921,925 **** #define XML_MAJOR_VERSION 1 #define XML_MINOR_VERSION 95 ! #define XML_MICRO_VERSION 6 #ifdef __cplusplus --- 993,997 ---- #define XML_MAJOR_VERSION 1 #define XML_MINOR_VERSION 95 ! #define XML_MICRO_VERSION 7 #ifdef __cplusplus Index: iasciitab.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/expat/iasciitab.h,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.16.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.16.1 *** iasciitab.h 11 Feb 2002 23:13:05 -0000 1.1.1.1 --- iasciitab.h 21 Oct 2003 20:02:34 -0000 1.1.1.1.16.1 *************** *** 1,5 **** ! /* ! Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd ! See the file COPYING for copying permission. */ --- 1,4 ---- ! /* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd ! See the file COPYING for copying permission. */ Index: internal.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/expat/internal.h,v retrieving revision 1.1 retrieving revision 1.1.14.1 diff -C2 -d -r1.1 -r1.1.14.1 *** internal.h 25 Jan 2003 22:41:29 -0000 1.1 --- internal.h 21 Oct 2003 20:02:34 -0000 1.1.14.1 *************** *** 21,35 **** */ ! #if defined(__GNUC__) ! /* Instability reported with egcs on a RedHat Linux 7.3. ! Let's comment it out: #define FASTCALL __attribute__((stdcall, regparm(3))) and let's try this: */ #define FASTCALL __attribute__((regparm(3))) - #define PTRCALL #define PTRFASTCALL __attribute__((regparm(3))) - #elif defined(WIN32) /* Using __fastcall seems to have an unexpected negative effect under MS VC++, especially for function pointers, so we won't use it for --- 21,38 ---- */ ! #if defined(__GNUC__) && defined(__i386__) ! /* We'll use this version by default only where we know it helps. ! ! regparm() generates warnings on Solaris boxes. See SF bug #692878. ! ! Instability reported with egcs on a RedHat Linux 7.3. ! Let's comment out: #define FASTCALL __attribute__((stdcall, regparm(3))) and let's try this: */ #define FASTCALL __attribute__((regparm(3))) #define PTRFASTCALL __attribute__((regparm(3))) + #endif /* Using __fastcall seems to have an unexpected negative effect under MS VC++, especially for function pointers, so we won't use it for *************** *** 39,47 **** the compiler cannot perform stack optimizations for call clusters. */ - #define FASTCALL - #define PTRCALL - #define PTRFASTCALL ! #endif #ifndef FASTCALL --- 42,47 ---- the compiler cannot perform stack optimizations for call clusters. */ ! /* Make sure all of these are defined if they aren't already. */ #ifndef FASTCALL Index: latin1tab.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/expat/latin1tab.h,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.16.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.16.1 *** latin1tab.h 11 Feb 2002 23:13:05 -0000 1.1.1.1 --- latin1tab.h 21 Oct 2003 20:02:34 -0000 1.1.1.1.16.1 *************** *** 1,5 **** ! /* ! Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd ! See the file COPYING for copying permission. */ --- 1,4 ---- ! /* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd ! See the file COPYING for copying permission. */ Index: utf8tab.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/expat/utf8tab.h,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.16.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.16.1 *** utf8tab.h 11 Feb 2002 23:13:05 -0000 1.1.1.1 --- utf8tab.h 21 Oct 2003 20:02:34 -0000 1.1.1.1.16.1 *************** *** 1,5 **** ! /* ! Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd ! See the file COPYING for copying permission. */ --- 1,4 ---- ! /* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd ! See the file COPYING for copying permission. */ Index: winconfig.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/expat/winconfig.h,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.16.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.16.1 *** winconfig.h 11 Feb 2002 23:13:08 -0000 1.1.1.1 --- winconfig.h 21 Oct 2003 20:02:34 -0000 1.1.1.1.16.1 *************** *** 6,11 **** ** it under the terms of the MIT/X license (contained in the COPYING file ** with this distribution.) - ** - ** */ --- 6,9 ---- *************** *** 22,27 **** #define XML_NS 1 #define XML_DTD 1 - #define XML_BYTE_ORDER 12 #define XML_CONTEXT_BYTES 1024 #endif /* ndef WINCONFIG_H */ --- 20,30 ---- #define XML_NS 1 #define XML_DTD 1 #define XML_CONTEXT_BYTES 1024 + + /* we will assume all Windows platforms are little endian */ + #define BYTEORDER 1234 + + /* Windows has memmove() available. */ + #define HAVE_MEMMOVE #endif /* ndef WINCONFIG_H */ Index: xmlparse.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/expat/xmlparse.c,v retrieving revision 1.5 retrieving revision 1.5.12.1 diff -C2 -d -r1.5 -r1.5.12.1 *** xmlparse.c 28 Jan 2003 06:42:40 -0000 1.5 --- xmlparse.c 21 Oct 2003 20:02:34 -0000 1.5.12.1 *************** *** 6,38 **** #include <string.h> /* memset(), memcpy() */ ! #ifdef COMPILED_FROM_DSP #include "winconfig.h" - #define XMLPARSEAPI(type) type __cdecl - #include "expat.h" - #undef XMLPARSEAPI - #elif defined(MACOS_CLASSIC) [...1671 lines suppressed...] --- 5649,5654 ---- pool->blocks = (BLOCK *) pool->mem->realloc_fcn(pool->blocks, ! (offsetof(BLOCK, s) ! + blockSize * sizeof(XML_Char))); if (pool->blocks == NULL) return XML_FALSE; *************** *** 5547,5551 **** blockSize *= 2; tem = (BLOCK *)pool->mem->malloc_fcn(offsetof(BLOCK, s) ! + blockSize * sizeof(XML_Char)); if (!tem) return XML_FALSE; --- 5666,5670 ---- blockSize *= 2; tem = (BLOCK *)pool->mem->malloc_fcn(offsetof(BLOCK, s) ! + blockSize * sizeof(XML_Char)); if (!tem) return XML_FALSE; Index: xmlrole.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/expat/xmlrole.c,v retrieving revision 1.5 retrieving revision 1.5.12.1 diff -C2 -d -r1.5 -r1.5.12.1 *** xmlrole.c 25 Jan 2003 22:48:51 -0000 1.5 --- xmlrole.c 21 Oct 2003 20:02:35 -0000 1.5.12.1 *************** *** 8,14 **** #include "macconfig.h" #else ! /* Unused - MvL #include <expat_config.h> ! */ #endif /* ndef COMPILED_FROM_DSP */ --- 8,14 ---- #include "macconfig.h" #else ! #ifdef HAVE_EXPAT_CONFIG_H #include <expat_config.h> ! #endif #endif /* ndef COMPILED_FROM_DSP */ Index: xmltok.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/expat/xmltok.c,v retrieving revision 1.3 retrieving revision 1.3.12.1 diff -C2 -d -r1.3 -r1.3.12.1 *** xmltok.c 25 Jan 2003 22:41:29 -0000 1.3 --- xmltok.c 21 Oct 2003 20:02:35 -0000 1.3.12.1 *************** *** 8,14 **** #include "macconfig.h" #else ! /* Unused - MvL #include <expat_config.h> ! */ #endif /* ndef COMPILED_FROM_DSP */ --- 8,14 ---- #include "macconfig.h" #else ! #ifdef HAVE_EXPAT_CONFIG_H #include <expat_config.h> ! #endif #endif /* ndef COMPILED_FROM_DSP */ Index: xmltok_impl.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/expat/xmltok_impl.c,v retrieving revision 1.2 retrieving revision 1.2.12.1 diff -C2 -d -r1.2 -r1.2.12.1 *** xmltok_impl.c 25 Jan 2003 22:41:29 -0000 1.2 --- xmltok_impl.c 21 Oct 2003 20:02:35 -0000 1.2.12.1 *************** *** 883,887 **** { if (ptr == end) ! return XML_TOK_PARTIAL; switch (BYTE_TYPE(enc, ptr)) { CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr) --- 883,887 ---- { if (ptr == end) ! return -XML_TOK_PERCENT; switch (BYTE_TYPE(enc, ptr)) { CHECK_NMSTRT_CASES(enc, ptr, end, nextTokPtr) --- expat.h.in DELETED ---

4 6

[Python-checkins] python/dist/src/PCbuild make_versioninfo.dsp, NONE, 1.1.2.1 pcbuild.dsw, 1.34, 1.34.10.1
by theller＠users.sourceforge.net 22 Oct '03

22 Oct '03

Update of /cvsroot/python/python/dist/src/PCbuild In directory sc8-pr-cvs1:/tmp/cvs-serv13792 Modified Files: Tag: release23-maint pcbuild.dsw Added Files: Tag: release23-maint make_versioninfo.dsp Log Message: Backport from the trunk. To build on windows, the manual editing of the python_nt.rc file to change the version number is no longer required. Instead, a make_versioninfo.exe is compiled, which spits out an include file for python_nt.rc. --- NEW FILE: make_versioninfo.dsp --- # Microsoft Developer Studio Project File - Name="make_versioninfo" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=make_versioninfo - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "make_versioninfo.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE !MESSAGE NMAKE /f "make_versioninfo.mak" CFG="make_versioninfo - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "make_versioninfo - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "make_versioninfo - Win32 Debug" (based on "Win32 (x86) Console Application") !MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 # PROP Scc_ProjName "make_versioninfo" # PROP Scc_LocalPath ".." CPP=cl.exe RSC=rc.exe !IF "$(CFG)" == "make_versioninfo - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 # PROP BASE Output_Dir "Release" # PROP BASE Intermediate_Dir "Release" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 # PROP Output_Dir "." # PROP Intermediate_Dir "x86-temp-release\make_versioninfo" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\Include" /I "..\PC" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 # ADD LINK32 odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1d000000" /subsystem:console /debug /machine:I386 # SUBTRACT LINK32 /pdb:none # Begin Custom Build InputPath=.\make_versioninfo.exe SOURCE="$(InputPath)" "..\PC\pythonnt_rc.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" .\make_versioninfo.exe >..\PC\pythonnt_rc.h # End Custom Build !ELSEIF "$(CFG)" == "make_versioninfo - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 # PROP BASE Output_Dir "Debug" # PROP BASE Intermediate_Dir "Debug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 # PROP Output_Dir "." # PROP Intermediate_Dir "x86-temp-debug\make_versioninfo" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\Include" /I "..\PC" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /YX /FD /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /i "..\Include" /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept # ADD LINK32 odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1d000000" /subsystem:console /debug /machine:I386 /out:"./make_versioninfo_d.exe" /pdbtype:sept # SUBTRACT LINK32 /pdb:none # Begin Custom Build InputPath=.\make_versioninfo_d.exe SOURCE="$(InputPath)" "..\PC\pythonnt_rc_d.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" .\make_versioninfo_d.exe >..\PC\pythonnt_rc_d.h # End Custom Build !ENDIF # Begin Target # Name "make_versioninfo - Win32 Release" # Name "make_versioninfo - Win32 Debug" # Begin Source File SOURCE=..\PC\make_versioninfo.c # End Source File # End Target # End Project Index: pcbuild.dsw =================================================================== RCS file: /cvsroot/python/python/dist/src/PCbuild/pcbuild.dsw,v retrieving revision 1.34 retrieving revision 1.34.10.1 diff -C2 -d -r1.34 -r1.34.10.1 *** pcbuild.dsw 21 Mar 2003 01:55:41 -0000 1.34 --- pcbuild.dsw 22 Oct 2003 19:38:10 -0000 1.34.10.1 *************** *** 160,163 **** --- 160,175 ---- ############################################################################### + Project: "make_versioninfo"=.\make_versioninfo.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + }}} + + ############################################################################### + Project: "mmap"=.\mmap.dsp - Package Owner=<4> *************** *** 228,231 **** --- 240,246 ---- Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name make_versioninfo + End Project Dependency }}}

1 0

python/dist/src/PC make_versioninfo.c, NONE, 1.1.2.1 .cvsignore, NONE, 1.1.2.1 python_nt.rc, 1.27.4.3, 1.27.4.4
by theller＠users.sourceforge.net 22 Oct '03

22 Oct '03

Update of /cvsroot/python/python/dist/src/PC In directory sc8-pr-cvs1:/tmp/cvs-serv13765 Modified Files: Tag: release23-maint python_nt.rc Added Files: Tag: release23-maint make_versioninfo.c .cvsignore Log Message: Backport from the trunk. To build on windows, the manual editing of the python_nt.rc file to change the version number is no longer required. Instead, a make_versioninfo.exe is compiled, which spits out an include file for python_nt.rc. --- NEW FILE: make_versioninfo.c --- #include <stdio.h> #include "patchlevel.h" /* * This program prints out an include file containing fields required to build * the version info resource of pythonxx.dll because the resource compiler * cannot do the arithmetic. */ /* * FIELD3 is the third field of the version number. * This is what we'd like FIELD3 to be: * * #define FIELD3 (PY_MICRO_VERSION*1000 + PY_RELEASE_LEVEL*10 + PY_RELEASE_SERIAL) * * but that neither gives an error nor comes anywhere close to working. * * For 2.4a0, * PY_MICRO_VERSION = 0 * PY_RELEASE_LEVEL = 'alpha' = 0xa * PY_RELEASE_SERIAL = 0 * * gives FIELD3 = 0*1000 + 10*10 + 0 = 100 */ int main(int argc, char **argv) { printf("/* This file created by make_versioninfo.exe */\n"); printf("#define FIELD3 %d\n", PY_MICRO_VERSION*1000 + PY_RELEASE_LEVEL*10 + PY_RELEASE_SERIAL); printf("#define MS_DLL_ID \"%d.%d\"\n", PY_MAJOR_VERSION, PY_MINOR_VERSION); printf("#define PYTHON_DLL_NAME \"python%d%d.dll\"\n", PY_MAJOR_VERSION, PY_MINOR_VERSION); return 0; } --- NEW FILE: .cvsignore --- pythonnt_rc.h pythonnt_rc_d.h Index: python_nt.rc =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/python_nt.rc,v retrieving revision 1.27.4.3 retrieving revision 1.27.4.4 diff -C2 -d -r1.27.4.3 -r1.27.4.4 *** python_nt.rc 1 Oct 2003 17:35:01 -0000 1.27.4.3 --- python_nt.rc 22 Oct 2003 19:38:04 -0000 1.27.4.4 *************** *** 7,45 **** #include "modsupport.h" #include "patchlevel.h" ! ! /* Across releases, change: ! * MS_DLL_ID if the minor version number changes. ! * PYTHON_DLL_NAME ditto. ! * MS_DLL_ID must match PY_VERSION in the Windows install script. ! */ ! #define MS_DLL_ID "2.3" ! ! #ifndef PYTHON_DLL_NAME ! #define PYTHON_DLL_NAME "python23.dll" #endif - - /* Nothing below this should need to be changed except for copyright - * notices, company name, and FIELD3. Unfortunately, all attempts - * to get the resource compiler to do arithmetic in macros have - * failed miserably -- it gives syntax errors, ignores operators, - * or does stuff that's simply bizarre. - */ - - - /* This is what we'd like FIELD3 to be: - * - * #define FIELD3 (PY_MICRO_VERSION*1000 + PY_RELEASE_LEVEL*10 + PY_RELEASE_SERIAL) - * - * but that neither gives an error nor comes anywhere close to working. The - * following comment and #define are output from PCbuild\field3.py: - * - * For 2.3.2, - * PY_MICRO_VERSION = 2 - * PY_RELEASE_LEVEL = 'final' = 0xf - * PY_RELEASE_SERIAL = 0 - * - * and 2*1000 + 15*10 + 0 = 2150 - */ - #define FIELD3 2150 /* e.g., 2.1a2 --- 7,15 ---- #include "modsupport.h" #include "patchlevel.h" ! #ifdef _DEBUG ! # include "pythonnt_rc_d.h" ! #else ! # include "pythonnt_rc.h" #endif /* e.g., 2.1a2

1 0

python/nondist/peps pep-0000.txt, 1.253, 1.254 pep-0289.txt, 1.2, 1.3
by rhettinger＠users.sourceforge.net 22 Oct '03

22 Oct '03

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1:/tmp/cvs-serv28567 Modified Files: pep-0000.txt pep-0289.txt Log Message: Resurrect the PEP on generator expressions Index: pep-0000.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0000.txt,v retrieving revision 1.253 retrieving revision 1.254 diff -C2 -d -r1.253 -r1.254 *** pep-0000.txt 24 Sep 2003 10:30:08 -0000 1.253 --- pep-0000.txt 22 Oct 2003 18:09:35 -0000 1.254 *************** *** 98,101 **** --- 98,102 ---- I 287 reStructuredText Docstring Format Goodger S 288 Generators Attributes and Exceptions Hettinger + S 289 Generator Expressions Hettinger S 292 Simpler String Substitutions Warsaw S 294 Type Names in the types Module Tirosh *************** *** 183,187 **** SR 270 uniq method for list objects Petrone SR 271 Prefixing sys.path by command line option Giacometti - SR 289 Generator Comprehensions Hettinger SR 295 Interpretation of multiline string constants Koltsov SR 296 Adding a bytes Object Type Gilbert --- 184,187 ---- *************** *** 305,309 **** I 287 reStructuredText Docstring Format Goodger S 288 Generators Attributes and Exceptions Hettinger ! SR 289 Generator Comprehensions Hettinger I 290 Code Migration and Modernization Hettinger I 291 Backward Compatibility for Standard Library Norwitz --- 305,309 ---- I 287 reStructuredText Docstring Format Goodger S 288 Generators Attributes and Exceptions Hettinger ! S 289 Generator Expressions Hettinger I 290 Code Migration and Modernization Hettinger I 291 Backward Compatibility for Standard Library Norwitz Index: pep-0289.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0289.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pep-0289.txt 30 Aug 2003 23:57:36 -0000 1.2 --- pep-0289.txt 22 Oct 2003 18:09:36 -0000 1.3 *************** *** 1,244 **** PEP: 289 ! Title: Generator Comprehensions Version: $Revision$ Last-Modified: $Date$ Author: python(a)rcn.com (Raymond D. Hettinger) ! Status: Rejected Type: Standards Track Created: 30-Jan-2002 Python-Version: 2.3 ! Post-History: Abstract ! This PEP introduces generator comprehensions as an idea for ! enhancing the generators introduced in Python version 2.2 [1]. ! The goal is to increase the convenience, utility, and power of ! generators by making it easy to convert a list comprehension into ! a generator. Rationale ! Python 2.2 introduced the concept of an iterable interface as ! proposed in PEP 234 [4]. The iter() factory function was provided ! as common calling convention and deep changes were made to use ! iterators as a unifying theme throughout Python. The unification ! came in the form of establishing a common iterable interface for ! mappings, sequences, and file objects. ! Generators, as proposed in PEP 255 [1], were introduced as a means ! for making it easier to create iterators, especially ones with ! complex internal execution or variable states. When I created new ! programs, generators were often the tool of choice for creating an ! iterator. ! However, when updating existing programs, I found that the tool ! had another use, one that improved program function as well as ! structure. Some programs exhibited a pattern of creating large ! lists and then looping over them. As data sizes increased, the ! programs encountered scalability limitations owing to excessive ! memory consumption (and malloc time) for the intermediate lists. ! Generators were found to be directly substitutable for the lists ! while eliminating the memory issues through lazy evaluation ! a.k.a. just in time manufacturing. ! Python itself encountered similar issues. As a result, xrange() ! and xreadlines() were introduced. And, in the case of file ! objects and mappings, just-in-time evaluation became the norm. ! Generators provide a tool to program memory conserving for-loops ! whenever complete evaluation is not desired because of memory ! restrictions or availability of data. ! The next step in the evolution of generators is to establish a ! generator alternative to list comprehensions [3]. This ! alternative provides a simple way to convert a list comprehension ! into a generator whenever memory issues arise. ! This suggestion is designed to take advantage of the existing ! implementation and require little additional effort to ! incorporate. It is backward compatible and requires no new ! keywords. BDFL Pronouncements ! Generator comprehensions are REJECTED. The rationale is that the ! benefits are marginal since generators can already be coded ! directly and the costs are high because implementation and ! maintenance require major efforts with the parser. ! Reference Implementation ! There is not currently a CPython implementation; however, a ! simulation module written in pure Python is available on ! SourceForge [5]. The simulation is meant to allow direct ! experimentation with the proposal. ! There is also a module [6] with working source code for all of the ! examples used in this PEP. It serves as a test suite for the ! simulator and it documents how each the new feature works in ! practice. ! The authors and implementers of PEP 255 [1] were contacted to ! provide their assessment of whether these enhancements were going ! to be straight-forward to implement and require only minor ! modification of the existing generator code. Neil felt the ! assertion was correct. Ka-Ping thought so also. GvR said he ! could believe that it was true. Later GvR re-assessed and thought ! that it would be difficult to tweak the code generator to produce ! a separate object. Tim did not have an opportunity to give an ! assessment. ! Specification for Generator Comprehensions : ! If a list comprehension starts with a 'yield' keyword, then ! express the comprehension with a generator. For example: ! g = [yield (len(line),line) for line in file if len(line)>5] ! This would be implemented as if it had been written: - def __temp(self): - for line in file: - if len(line) > 5: - yield (len(line), line) - g = __temp() ! Note A: There is some discussion about whether the enclosing ! brackets should be part of the syntax for generator ! comprehensions. On the plus side, it neatly parallels list ! comprehensions and would be immediately recognizable as a similar ! form with similar internal syntax (taking maximum advantage of ! what people already know). More importantly, it sets off the ! generator comprehension from the rest of the function so as to not ! suggest that the enclosing function is a generator (currently the ! only cue that a function is really a generator is the presence of ! the yield keyword). On the minus side, the brackets may falsely ! suggest that the whole expression returns a list. Most of the ! feedback received to date indicates that brackets are helpful and ! not misleading. Unfortunately, the one dissent is from GvR. ! A key advantage of the generator comprehension syntax is that it ! makes it trivially easy to transform existing list comprehension ! code to a generator by adding yield. Likewise, it can be ! converted back to a list by deleting yield. This makes it easy to ! scale-up programs from small datasets to ones large enough to ! warrant just in time evaluation. ! Note B: List comprehensions expose their looping variable and ! leave that variable in the enclosing scope. The code, [str(i) for ! i in range(8)] leaves 'i' set to 7 in the scope where the ! comprehension appears. This behavior is by design and reflects an ! intent to duplicate the result of coding a for-loop instead of a ! list comprehension. Further, the variable 'i' is in a defined and ! potentially useful state on the line immediately following the ! list comprehension. ! In contrast, generator comprehensions do not expose the looping ! variable to the enclosing scope. The code, [yield str(i) for i in ! range(8)] leaves 'i' untouched in the scope where the ! comprehension appears. This is also by design and reflects an ! intent to duplicate the result of coding a generator directly ! instead of a generator comprehension. Further, the variable 'i' ! is not in a defined state on the line immediately following the ! list comprehension. It does not come into existence until ! iteration starts (possibly never). - Comments from GvR: Cute hack, but I think the use of the [] syntax - strongly suggests that it would return a list, not an - iterator. I also think that this is trying to turn Python into - a functional language, where most algorithms use lazy infinite - sequences, and I just don't think that's where its future - lies. ! I don't think it's worth the trouble. I expect it will take a ! lot of work to hack it into the code generator: it has to ! create a separate code object in order to be a generator. ! List comprehensions are inlined, so I expect that the ! generator comprehension code generator can't share much with ! the list comprehension code generator. And this for something ! that's not that common and easily done by writing a 2-line ! helper function. IOW the ROI isn't high enough. ! Comments from Ka-Ping Yee: I am very happy with the things you have ! proposed in this PEP. I feel quite positive about generator ! comprehensions and have no reservations. So a +1 on that. ! Comments from Neil Schemenauer: I'm -0 on the generator list ! comprehensions. They don't seem to add much. You could ! easily use a nested generator to do the same thing. They ! smell like lambda. ! Comments from Magnus Lie Hetland: Generator comprehensions seem mildly ! useful, but I vote +0. Defining a separate, named generator ! would probably be my preference. On the other hand, I do see ! the advantage of "scaling up" from list comprehensions. ! Comments from the Community: The response to the generator comprehension ! proposal has been mostly favorable. There were some 0 votes ! from people who didn't see a real need or who were not ! energized by the idea. Some of the 0 votes were tempered by ! comments that the reviewer did not even like list ! comprehensions or did not have any use for generators in any ! form. The +1 votes outnumbered the 0 votes by about two to ! one. ! Author response: I've studied several syntactical variations and ! concluded that the brackets are essential for: ! - teachability (it's like a list comprehension) ! - set-off (yield applies to the comprehension not the enclosing ! function) ! - substitutability (list comprehensions can be made lazy just by ! adding yield) ! What I like best about generator comprehensions is that I can ! design using list comprehensions and then easily switch to a ! generator (by adding yield) in response to scalability ! requirements (when the list comprehension produces too large ! of an intermediate result). Had generators already been ! in-place when list comprehensions were accepted, the yield ! option might have been incorporated from the start. For ! certain, the mathematical style notation is explicit and ! readable as compared to a separate function definition with an ! embedded yield. ! References ! [1] PEP 255 Simple Generators ! http://python.sourceforge.net/peps/pep-0255.html ! [2] PEP 212 Loop Counter Iteration ! http://python.sourceforge.net/peps/pep-0212.html ! [3] PEP 202 List Comprehensions ! http://python.sourceforge.net/peps/pep-0202.html ! [4] PEP 234 Iterators ! http://python.sourceforge.net/peps/pep-0234.html ! [5] A pure Python simulation of every feature in this PEP is at: ! http://sourceforge.net/tracker/download.php?group_id=5470&atid=305470&file_… ! [6] The full, working source code for each of the examples in this PEP ! along with other examples and tests is at: ! http://sourceforge.net/tracker/download.php?group_id=5470&atid=305470&file_… - [7] Another partial implementation is at: - http://www.python.org/sf/795947 Copyright ! This document has been placed in the public domain. ! ! Local Variables: ! mode: indented-text ! indent-tabs-mode: nil ! fill-column: 70 ! End: --- 1,275 ---- PEP: 289 ! Title: Generator Expressions Version: $Revision$ Last-Modified: $Date$ Author: python(a)rcn.com (Raymond D. Hettinger) ! Status: Active Type: Standards Track + Content-Type: text/x-rst Created: 30-Jan-2002 Python-Version: 2.3 ! Post-History: 22-Oct-2003 Abstract + ======== ! This PEP introduces generator expressions as a high performance, ! memory efficient generalization of list comprehensions [1]_ and ! generators [2]_. Rationale + ========= ! Experience with list comprehensions has shown their wide-spread ! utility throughout Python. However, many of the use cases do ! not need to have a full list created in memory. Instead, they ! only need to iterate over the elements one at a time. ! For instance, the following summation code will build a full list of ! squares in memory, iterate over those values, and, when the reference ! is no longer needed, delete the list:: ! sum([x*x for x in range(10)]) ! Time, clarity, and memory are conserved by using an generator ! expession instead:: ! sum(x*x for x in range(10)) ! Similar benefits are conferred on constructors for container objects:: ! ! s = Set(word for line in page for word in line.split()) ! d = dict( (k, func(v)) for k in keylist) ! ! Generator expressions are especially useful in functions that reduce ! an iterable input to a single value:: ! ! sum(len(line) for line in file if line.strip()) ! ! Accordingly, generator expressions are expected to partially eliminate ! the need for reduce() which is notorious for its lack of clarity. And, ! there are additional speed and clarity benefits from writing expressions ! directly instead of using lambda. ! ! List comprehensions greatly reduced the need for filter() and map(). ! Likewise, generator expressions are expected to minimize the need ! for itertools.ifilter() and itertools.imap(). In contrast, the ! utility of other itertools will be enhanced by generator expressions:: ! ! dotproduct = sum(x*y for x,y in itertools.izip(x_vector, y_vector)) ! ! Having a syntax similar to list comprehensions also makes it easy to ! convert existing code into an generator expression when scaling up ! application. BDFL Pronouncements + =================== ! The previous version of this PEP was REJECTED. The bracketed yield ! syntax left something to be desired; the performance gains had not been ! demonstrated; and the range of use cases had not been shown. After, ! much discussion on the python-dev list, the PEP has been resurrected ! its present form. The impetus for the discussion was an innovative ! proposal from Peter Norvig [3]_. ! The Gory Details ! ================ ! 1. The semantics of a generator expression are equivalent to creating ! an anonymous generator function and calling it. There's still discussion ! about whether that generator function should copy the current value of all ! free variables into default arguments. ! 2. The syntax requires that a generator expression always needs to be inside ! a set of parentheses and cannot have a comma on either side. Unfortunately, ! this is different from list comprehensions. While [1, x for x in R] is ! illegal, [x for x in 1, 2, 3] is legal, meaning [x for x in (1,2,3)]. ! With reference to the file Grammar/Grammar in CVS, two rules change: ! a) The rule:: + atom: '(' [testlist] ')' ! changes to:: ! atom: '(' [listmaker1] ')' ! where listmaker1 is almost the same as listmaker, but only allows ! a single test after 'for' ... 'in'. ! b) The rule for arglist needs similar changes. ! 2. The loop variable is not exposed to the surrounding function. This ! facilates the implementation and makes typical use cases more reliable. ! In some future version of Python, list comprehensions will also hide the ! induction variable from the surrounding code (and, in Py2.4, warnings ! will be issued for code accessing the induction variable). ! ! 3. There is still discussion about whether variable referenced in generator ! expressions will exhibit late binding just like other Python code. In the ! following example, the iterator runs *after* the value of y is set to one:: ! def h(): ! y = 0 ! l = [1,2] ! def gen(S): ! for x in S: ! yield x+y ! it = gen(l) ! y = 1 ! for v in it: ! print v ! 4. List comprehensions will remain unchanged:: ! [x for x in S] # This is a list comprehension. ! [(x for x in S)] # This is a list containing one generator expression. ! Reduction Functions ! =================== ! The utility of generator expressions is greatly enhanced when combined ! with appropriate reduction functions like sum(), min(), and max(). I ! propose creating a set of high speed reduction functions designed to tap the ! power of generator expressions and replace the most common uses of reduce():: ! def xorsum(it): ! return reduce(operator.xor, it, 0) ! def product(it): ! return reduce(operator.mul, it, 1) ! def anytrue(it): ! for elem in it: ! if it: ! return True ! return False ! def alltrue(it): ! for elem in it: ! if it: ! return False ! return True ! def horner(it, x): ! 'horner([6,3,4], 5) evaluates 6*x**2 + 3*x + 4 at x=5' ! cum = 0.0 ! for c in it: ! cum = cum*x + c ! return cum + def mean(it): + data = list(it) + return sum(data) / len(data) ! def smallest(it, siz=1): ! result = [] ! for elem in it: ! if len(result) < siz: ! bisect.insort_left(result, elem) ! elif elem < result[-1]: ! result.pop() ! bisect.insort_left(result, elem) ! return result ! def largest(it, siz=1): ! result = [] ! for elem in it: ! if len(result) < siz: ! bisect.insort_left(result, elem) ! elif elem > result[0]: ! result.pop(0) ! bisect.insort_left(result, elem) ! result.reverse() ! return result ! Notes on reduce() ! ================= ! Reduce typically has three types of use cases: ! 1) Common reduction functions applied directly to elements in a sequence. ! This use case is addressed by the sum(), min(), max(), and the additional ! functions listed above. ! 2) Reduce is often used with lambda when the data needs be extracted from ! complex sequence elements. For example:: ! reduce(lambda sum, x: sum + x.myattr, data, 0) ! reduce(lambda prod, x: prod * x[3], data, 1) ! ! In concert with reduction functions, generator expressions completely ! fulfill these use cases:: ! ! sum(x.myattr for x in data) ! product(x[3] for x in data) ! ! 3) On rare occasions, the reduction function is non-standard and requires ! custom coding:: ! ! reduce(lambda cum, c: (cum >> 8) ^ crc32[ord(a) ^ (cum & 0x00ff)], data, -1) ! ! Because a complex lambda is required, this use case becomes clearer and ! faster when coded directly as a for-loop:: ! ! cum = -1 ! for c in data: ! cum = (cum >> 8) ^ crc32[ord(a) ^ (cum & 0x00ff)] ! ! In conclusion, after adding generator expressions and a set of common reduction ! functions, few, if any cases remain for reduce(). ! ! ! Acknowledgements ! ================ ! ! * Raymond Hettinger first proposed the idea of "generator comprehensions" ! in January 2002. ! ! * Peter Norvig resurrected the discussion in his proposal for ! Accumulation Displays [3]_. ! ! * Alex Martelli provided critical measurements that proved the performance ! benefits of generator expressions. He also provided strong arguments ! that they were a desirable thing to have. ! ! * Samuele Pedroni provided the example of late binding. ! Various contributors have made arguments for and against late binding. ! ! * Phillip Eby suggested "iterator expressions" as the name. ! ! * Subsequently, Tim Peters suggested the name "generator expressions". ! ! ! References ! ========== ! ! .. [1] PEP 202 List Comprehensions ! http://python.sourceforge.net/peps/pep-0202.html ! ! .. [2] PEP 255 Simple Generators ! http://python.sourceforge.net/peps/pep-0255.html ! ! .. [3] Peter Norvig's Accumulation Display Proposal ! http:///www.norvig.com/pyacc.html Copyright + ========= ! This document has been placed in the public domain. ! .. ! Local Variables: ! mode: indented-text ! indent-tabs-mode: nil ! sentence-end-double-space: t ! fill-column: 70 ! End:

1 0

python/dist/src/Lib profile.py,1.49,1.50
by gvanrossum＠users.sourceforge.net 22 Oct '03

22 Oct '03

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv19386 Modified Files: profile.py Log Message: Remove unneeded import. Index: profile.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/profile.py,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** profile.py 22 Oct 2003 16:49:01 -0000 1.49 --- profile.py 22 Oct 2003 17:22:18 -0000 1.50 *************** *** 184,188 **** # the timer() result contains two values in all # cases. - import operator def get_time_timer(timer=timer, sum=sum): return sum(timer()) --- 184,187 ----

1 0

python/dist/src/Lib profile.py,1.48,1.49
by rhettinger＠users.sourceforge.net 22 Oct '03

22 Oct '03

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv14109 Modified Files: profile.py Log Message: Replace a reduce() with sum(). Index: profile.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/profile.py,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** profile.py 27 Feb 2003 20:14:38 -0000 1.48 --- profile.py 22 Oct 2003 16:49:01 -0000 1.49 *************** *** 185,191 **** # cases. import operator ! def get_time_timer(timer=timer, ! reduce=reduce, reducer=operator.add): ! return reduce(reducer, timer(), 0) self.get_time = get_time_timer self.t = self.get_time() --- 185,190 ---- # cases. import operator ! def get_time_timer(timer=timer, sum=sum): ! return sum(timer()) self.get_time = get_time_timer self.t = self.get_time()

1 0

python/dist/src/Lib cmd.py,1.36,1.37
by akuchling＠users.sourceforge.net 22 Oct '03

22 Oct '03

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1:/tmp/cvs-serv23135 Modified Files: cmd.py Log Message: Add docstring Index: cmd.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/cmd.py,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** cmd.py 19 Feb 2003 02:35:02 -0000 1.36 --- cmd.py 22 Oct 2003 14:38:54 -0000 1.37 *************** *** 170,173 **** --- 170,177 ---- def parseline(self, line): + """Parse the line into a command name and a string containing + the arguments. Returns a tuple containing (command, args, line). + 'command' and 'args' may be None if the line couldn't be parsed. + """ line = line.strip() if not line:

1 0