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/test/test_quopri.py b/Lib/test/test_quopri.py
index ed66dfc..631c974 100644
--- a/Lib/test/test_quopri.py
+++ b/Lib/test/test_quopri.py
@@ -1,7 +1,7 @@
from test import test_support
import unittest
-import sys, os, cStringIO
+import sys, os, cStringIO, subprocess
import quopri
@@ -176,17 +176,20 @@
def test_scriptencode(self):
(p, e) = self.STRINGS[-1]
- (cin, cout) = os.popen2("%s -mquopri" % sys.executable)
- cin.write(p)
- cin.close()
- self.assert_(cout.read() == e)
+ process = subprocess.Popen([sys.executable, "-mquopri"],
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+ cout, cerr = process.communicate(p)
+ # On Windows, Python will output the result to stdout using
+ # CRLF, as the mode of stdout is text mode. To compare this
+ # with the expected result, we need to do a line-by-line comparison.
+ self.assert_(cout.splitlines() == e.splitlines())
def test_scriptdecode(self):
(p, e) = self.STRINGS[-1]
- (cin, cout) = os.popen2("%s -mquopri -d" % sys.executable)
- cin.write(e)
- cin.close()
- self.assert_(cout.read() == p)
+ process = subprocess.Popen([sys.executable, "-mquopri", "-d"],
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+ cout, cerr = process.communicate(e)
+ self.assert_(cout.splitlines() == p.splitlines())
def test_main():
test_support.run_unittest(QuopriTestCase)