Mailman 3 September 2005 - Python-checkins

python/nondist/peps pep-0000.txt, 1.346, 1.347 pep-0308.txt, 1.22, 1.23
by gvanrossum＠users.sourceforge.net Sept. 30, 2005

Sept. 30, 2005

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv510 Modified Files: pep-0000.txt pep-0308.txt Log Message: Rename PEP 308 to "Conditional Expressions". Index: pep-0000.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0000.txt,v retrieving revision 1.346 retrieving revision 1.347 diff -u -d -r1.346 -r1.347 --- pep-0000.txt 30 Sep 2005 01:51:58 -0000 1.346 +++ pep-0000.txt 30 Sep 2005 14:42:36 -0000 1.347 @@ -63,7 +63,7 @@ Accepted PEPs (accepted; may not be implemented yet) - SA 308 If-then-else expression GvR, Hettinger + SA 308 Conditional Expressions GvR, Hettinger SA 328 Imports: Multi-Line and Absolute/Relative Aahz SA 342 Coroutines via Enhanced Generators GvR, Eby SA 343 Anonymous Block Redux and Generator Enhancements GvR @@ -353,7 +353,7 @@ SF 305 CSV File API Montanaro, et al I 306 How to Change Python's Grammar Hudson SF 307 Extensions to the pickle protocol GvR, Peters - SA 308 If-then-else expression GvR, Hettinger + SA 308 Conditional Expressions GvR, Hettinger SF 309 Partial Function Application Harris S 310 Reliable Acquisition/Release Pairs Hudson, Moore SF 311 Simplified GIL Acquisition for Extensions Hammond Index: pep-0308.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0308.txt,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- pep-0308.txt 30 Sep 2005 13:41:34 -0000 1.22 +++ pep-0308.txt 30 Sep 2005 14:42:36 -0000 1.23 @@ -1,5 +1,5 @@ PEP: 308 -Title: If-then-else expression +Title: Conditional Expressions Version: $Revision$ Last-Modified: $Date$ Author: Guido van Rossum, Raymond D. Hettinger

1 0

python/nondist/peps pep-0308.txt,1.21,1.22
by goodger＠users.sourceforge.net Sept. 30, 2005

Sept. 30, 2005

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18085 Modified Files: pep-0308.txt Log Message: fixed typo; added whitespace Index: pep-0308.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0308.txt,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- pep-0308.txt 30 Sep 2005 01:51:58 -0000 1.21 +++ pep-0308.txt 30 Sep 2005 13:41:34 -0000 1.22 @@ -9,6 +9,7 @@ Created: 7-Feb-2003 Post-History: 7-Feb-2003, 11-Feb-2003 + Adding a conditional expression On 9/29/2005, Guido decided to add conditional expressions in the @@ -21,11 +22,12 @@ stymied by a lack of consensus on the best syntax. That issue was resolved by simply deferring to a BDFL best judgment call. - The decision was validated by reviewing the how the syntax fared when + The decision was validated by reviewing how the syntax fared when applied throughout the standard library (this review approximates a sampling of real-world use cases, across a variety of applications, written by a number of programmers with diverse backgrounds). [3] + References [1] Pronouncement

1 0

python/dist/src/Doc/lib liblogging.tex, 1.33.2.5, 1.33.2.6
by vsajip＠users.sourceforge.net Sept. 30, 2005

Sept. 30, 2005

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30582 Modified Files: Tag: release24-maint liblogging.tex Log Message: Minor clarification of effective level calculation Index: liblogging.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/liblogging.tex,v retrieving revision 1.33.2.5 retrieving revision 1.33.2.6 diff -u -d -r1.33.2.5 -r1.33.2.6 --- liblogging.tex 16 Sep 2005 10:55:57 -0000 1.33.2.5 +++ liblogging.tex 30 Sep 2005 12:08:25 -0000 1.33.2.6 @@ -334,6 +334,20 @@ to be processed when the logger is the root logger, or delegation to the parent when the logger is a non-root logger). Note that the root logger is created with level \constant{WARNING}. + +The term "delegation to the parent" means that if a logger has a level +of NOTSET, its chain of ancestor loggers is traversed until either an +ancestor with a level other than NOTSET is found, or the root is +reached. + +If an ancestor is found with a level other than NOTSET, then that +ancestor's level is treated as the effective level of the logger where +the ancestor search began, and is used to determine how a logging +event is handled. + +If the root is reached, and it has a level of NOTSET, then all +messages will be processed. Otherwise, the root's level will be used +as the effective level. \end{methoddesc} \begin{methoddesc}{isEnabledFor}{lvl}

1 0

python/dist/src/Python pystate.c,2.42,2.43
by mwh＠users.sourceforge.net Sept. 30, 2005

Sept. 30, 2005

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16774/Python Modified Files: pystate.c Log Message: Forward port bugfix: [ 1307978 ] Unsatisfied symbols: _PyGILState_NoteThreadState (code) (note that this only happens in a threads-disabled build). Index: pystate.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/pystate.c,v retrieving revision 2.42 retrieving revision 2.43 diff -u -d -r2.42 -r2.43 --- pystate.c 20 Jun 2005 16:52:57 -0000 2.42 +++ pystate.c 30 Sep 2005 08:20:24 -0000 2.43 @@ -53,7 +53,9 @@ PyThreadState *_PyThreadState_Current = NULL; PyThreadFrameGetter _PyThreadState_GetFrame = NULL; +#ifdef WITH_THREAD static void _PyGILState_NoteThreadState(PyThreadState* tstate); +#endif PyInterpreterState * @@ -188,7 +190,9 @@ tstate->c_profileobj = NULL; tstate->c_traceobj = NULL; +#ifdef WITH_THREAD _PyGILState_NoteThreadState(tstate); +#endif HEAD_LOCK(); tstate->next = interp->tstate_head;

1 0

python/dist/src/Python pystate.c, 2.38.2.3, 2.38.2.4
by mwh＠users.sourceforge.net Sept. 30, 2005

Sept. 30, 2005

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15986/Python Modified Files: Tag: release24-maint pystate.c Log Message: Fix bug: [ 1307978 ] Unsatisfied symbols: _PyGILState_NoteThreadState (code) (note that this only happens in a threads-disabled build). Will forward port momentarily. Index: pystate.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/pystate.c,v retrieving revision 2.38.2.3 retrieving revision 2.38.2.4 diff -u -d -r2.38.2.3 -r2.38.2.4 --- pystate.c 23 Sep 2005 08:14:40 -0000 2.38.2.3 +++ pystate.c 30 Sep 2005 08:17:40 -0000 2.38.2.4 @@ -53,7 +53,9 @@ PyThreadState *_PyThreadState_Current = NULL; PyThreadFrameGetter _PyThreadState_GetFrame = NULL; +#ifdef WITH_THREAD static void _PyGILState_NoteThreadState(PyThreadState* tstate); +#endif PyInterpreterState * @@ -188,7 +190,9 @@ tstate->c_profileobj = NULL; tstate->c_traceobj = NULL; +#ifdef WITH_THREAD _PyGILState_NoteThreadState(tstate); +#endif HEAD_LOCK(); tstate->next = interp->tstate_head;

1 0

python/dist/src/Misc ACKS, 1.289.2.3, 1.289.2.4 NEWS, 1.1193.2.114, 1.1193.2.115
by nnorwitz＠users.sourceforge.net Sept. 30, 2005

Sept. 30, 2005

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12823/Misc Modified Files: Tag: release24-maint ACKS NEWS Log Message: - Patch #1309009, Fix segfault in pyexpat when the XML document is in latin_1, but Python incorrectly assumes it is in UTF-8 format Index: ACKS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/ACKS,v retrieving revision 1.289.2.3 retrieving revision 1.289.2.4 diff -u -d -r1.289.2.3 -r1.289.2.4 --- ACKS 26 Sep 2005 13:15:34 -0000 1.289.2.3 +++ ACKS 30 Sep 2005 04:58:23 -0000 1.289.2.4 @@ -303,6 +303,7 @@ Jiba Orjan Johansen Simon Johnston +Evan Jones Richard Jones Irmen de Jong Lucas de Jonge Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1193.2.114 retrieving revision 1.1193.2.115 diff -u -d -r1.1193.2.114 -r1.1193.2.115 --- NEWS 29 Sep 2005 20:49:21 -0000 1.1193.2.114 +++ NEWS 30 Sep 2005 04:58:23 -0000 1.1193.2.115 @@ -4,7 +4,7 @@ (editors: check NEWS.help for information about editing NEWS using ReST.) -What's New in Python 2.4.3a0? +What's New in Python 2.4.3c1? ============================= *Release date: XX-XX-200X* @@ -12,6 +12,9 @@ Extension Modules ----------------- +- Patch #1309009, Fix segfault in pyexpat when the XML document is in latin_1, + but Python incorrectly assumes it is in UTF-8 format + - Fix parse errors in the readline module when compiling without threads. Library

1 0

python/dist/src/Modules pyexpat.c, 2.89.2.1, 2.89.2.2
by nnorwitz＠users.sourceforge.net Sept. 30, 2005

Sept. 30, 2005

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12823/Modules Modified Files: Tag: release24-maint pyexpat.c Log Message: - Patch #1309009, Fix segfault in pyexpat when the XML document is in latin_1, but Python incorrectly assumes it is in UTF-8 format Index: pyexpat.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/pyexpat.c,v retrieving revision 2.89.2.1 retrieving revision 2.89.2.2 diff -u -d -r2.89.2.1 -r2.89.2.2 --- pyexpat.c 4 Mar 2005 14:38:07 -0000 2.89.2.1 +++ pyexpat.c 30 Sep 2005 04:58:23 -0000 2.89.2.2 @@ -417,6 +417,9 @@ { PyObject *result = STRING_CONV_FUNC(str); PyObject *value; + /* result can be NULL if the unicode conversion failed. */ + if (!result) + return result; if (!self->intern) return result; value = PyDict_GetItem(self->intern, result); @@ -572,7 +575,9 @@ Py_DECREF(v); } } - args = Py_BuildValue("(NN)", string_intern(self, name), container); + args = string_intern(self, name); + if (args != NULL) + args = Py_BuildValue("(NN)", args, container); if (args == NULL) { Py_DECREF(container); return;

1 0

python/dist/src/Lib/test test_minidom.py, 1.39.4.2, 1.39.4.3
by nnorwitz＠users.sourceforge.net Sept. 30, 2005

Sept. 30, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12823/Lib/test Modified Files: Tag: release24-maint test_minidom.py Log Message: - Patch #1309009, Fix segfault in pyexpat when the XML document is in latin_1, but Python incorrectly assumes it is in UTF-8 format Index: test_minidom.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_minidom.py,v retrieving revision 1.39.4.2 retrieving revision 1.39.4.3 diff -u -d -r1.39.4.2 -r1.39.4.3 --- test_minidom.py 25 Aug 2005 22:14:21 -0000 1.39.4.2 +++ test_minidom.py 30 Sep 2005 04:58:23 -0000 1.39.4.3 @@ -889,6 +889,15 @@ and doc.toxml('utf-8') == '<?xml version="1.0" encoding="utf-8"?><foo>\xe2\x82\xac</foo>' and doc.toxml('iso-8859-15') == '<?xml version="1.0" encoding="iso-8859-15"?><foo>\xa4</foo>', "testEncodings - encoding EURO SIGN") + + # Verify that character decoding errors throw exceptions instead of crashing + try: + doc = parseString('<fran\xe7ais>Comment \xe7a va ? Tr\xe8s bien ?</fran\xe7ais>') + except UnicodeDecodeError: + pass + else: + print 'parsing with bad encoding should raise a UnicodeDecodeError' + doc.unlink() class UserDataHandler:

1 0

python/dist/src/Modules pyexpat.c,2.90,2.91
by nnorwitz＠users.sourceforge.net Sept. 30, 2005

Sept. 30, 2005

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11176/Modules Modified Files: pyexpat.c Log Message: Patch #1309009, Fix segfault in pyexpat when the XML document is in latin_1, but Python incorrectly assumes it is in UTF-8 format Will backport. Index: pyexpat.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/pyexpat.c,v retrieving revision 2.90 retrieving revision 2.91 diff -u -d -r2.90 -r2.91 --- pyexpat.c 4 Mar 2005 14:37:01 -0000 2.90 +++ pyexpat.c 30 Sep 2005 04:46:49 -0000 2.91 @@ -417,6 +417,9 @@ { PyObject *result = STRING_CONV_FUNC(str); PyObject *value; + /* result can be NULL if the unicode conversion failed. */ + if (!result) + return result; if (!self->intern) return result; value = PyDict_GetItem(self->intern, result); @@ -572,7 +575,9 @@ Py_DECREF(v); } } - args = Py_BuildValue("(NN)", string_intern(self, name), container); + args = string_intern(self, name); + if (args != NULL) + args = Py_BuildValue("(NN)", args, container); if (args == NULL) { Py_DECREF(container); return;

1 0

python/dist/src/Lib/test test_minidom.py, 1.41, 1.42
by nnorwitz＠users.sourceforge.net Sept. 30, 2005

Sept. 30, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11176/Lib/test Modified Files: test_minidom.py Log Message: Patch #1309009, Fix segfault in pyexpat when the XML document is in latin_1, but Python incorrectly assumes it is in UTF-8 format Will backport. Index: test_minidom.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_minidom.py,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- test_minidom.py 25 Aug 2005 22:14:15 -0000 1.41 +++ test_minidom.py 30 Sep 2005 04:46:49 -0000 1.42 @@ -889,6 +889,15 @@ and doc.toxml('utf-8') == '<?xml version="1.0" encoding="utf-8"?><foo>\xe2\x82\xac</foo>' and doc.toxml('iso-8859-15') == '<?xml version="1.0" encoding="iso-8859-15"?><foo>\xa4</foo>', "testEncodings - encoding EURO SIGN") + + # Verify that character decoding errors throw exceptions instead of crashing + try: + doc = parseString('<fran\xe7ais>Comment \xe7a va ? Tr\xe8s bien ?</fran\xe7ais>') + except UnicodeDecodeError: + pass + else: + print 'parsing with bad encoding should raise a UnicodeDecodeError' + doc.unlink() class UserDataHandler:

1 0