2 Commits

Author	SHA1	Message	Date
Guido van Rossum	b940e113bf	SF patch 1631942 by Collin Winter: ... (a) "except E, V" -> "except E as V" (b) V is now limited to a simple name (local variable) (c) V is now deleted at the end of the except block	2007-01-10 16:19:56 +00:00
Thomas Wouters	49fd7fa443	Merge p3yk branch with the trunk up to revision 45595. This breaks a fair ... number of tests, all because of the codecs/_multibytecodecs issue described here (it's not a Py3K issue, just something Py3K discovers): http://mail.python.org/pipermail/python-dev/2006-April/064051.html Hye-Shik Chang promised to look for a fix, so no need to fix it here. The tests that are expected to break are: test_codecencodings_cn test_codecencodings_hk test_codecencodings_jp test_codecencodings_kr test_codecencodings_tw test_codecs test_multibytecodec This merge fixes an actual test failure (test_weakref) in this branch, though, so I believe merging is the right thing to do anyway.	2006-04-21 10:40:58 +00:00