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/Lib/platform.py b/Lib/platform.py
index 62fdaf4..288bc95 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -607,7 +607,8 @@
versioninfo = (version,stage,nonrel)
if sysa:
machine = {0x1: '68k',
- 0x2: 'PowerPC'}.get(sysa,'')
+ 0x2: 'PowerPC',
+ 0xa: 'i386'}.get(sysa,'')
return release,versioninfo,machine
def _java_getprop(name,default):