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.

1 files changed, 11 insertions, 5 deletions

diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py
index fd5670a..ab3da86 100644
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@ -100,12 +100,18 @@ else:
     print "writelines accepted sequence of non-string objects"
 f.close()
 
-try:
-    sys.stdin.seek(-1)
-except IOError:
-    pass
+# This causes the interpreter to exit on OSF1 v5.1.
+if sys.platform != 'osf1V5':
+    try:
+        sys.stdin.seek(-1)
+    except IOError:
+        pass
+    else:
+        print "should not be able to seek on sys.stdin"
 else:
-    print "should not be able to seek on sys.stdin"
+    print >>sys.__stdout__, (
+        '  Skipping sys.stdin.seek(-1), it may crash the interpreter.'
+        ' Test manually.')
 
 try:
     sys.stdin.truncate()