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.
diff --git a/Misc/ACKS b/Misc/ACKS
index 9225031..a824a86 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -132,6 +132,7 @@
Matt Conway
David M. Cooke
Greg Copeland
+Aldo Cortesi
David Costanzo
Scott Cotton
Greg Couch
@@ -477,6 +478,7 @@
Dan Pierson
Martijn Pieters
François Pinard
+Zach Pincus
Michael Piotrowski
Iustin Pop
John Popplewell
@@ -536,6 +538,7 @@
Gregor Schmid
Ralf Schmitt
Peter Schneider-Kamp
+Chad J. Schroeder
Sam Schulenburg
Stefan Schwarzer
Dietmar Schwertberger