From 34d1928766bcae11d8f679a6bf361d9210b6429e Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Thu, 9 Aug 2007 01:03:29 +0000 Subject: SF patch# 1770008 by Christian Heimes (plus some extras). Completely get rid of StringIO.py and cStringIO.c. I had to fix a few tests and modules beyond what Christian did, and invent a few conventions. E.g. in elementtree, I chose to write/return Unicode strings whe no encoding is given, but bytes when an explicit encoding is given. Also mimetools was made to always assume binary files. --- Lib/test/test_builtin.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Lib/test/test_builtin.py') diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py index 7e37c29567..a4ae21aa5d 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -5,7 +5,7 @@ from test.test_support import fcmp, TESTFN, unlink, run_unittest, \ run_with_locale from operator import neg -import sys, warnings, cStringIO, random, UserDict +import sys, warnings, random, UserDict, io warnings.filterwarnings("ignore", "hex../oct.. of negative int", FutureWarning, __name__) warnings.filterwarnings("ignore", "integer argument expected", @@ -1455,11 +1455,11 @@ class BuiltinTest(unittest.TestCase): self.assertRaises(ValueError, input) sys.stdout = BitBucket() - sys.stdin = cStringIO.StringIO("NULL\0") + sys.stdin = io.StringIO("NULL\0") self.assertRaises(TypeError, input, 42, 42) - sys.stdin = cStringIO.StringIO(" 'whitespace'") + sys.stdin = io.StringIO(" 'whitespace'") self.assertEqual(input(), " 'whitespace'") - sys.stdin = cStringIO.StringIO() + sys.stdin = io.StringIO() self.assertRaises(EOFError, input) del sys.stdout -- cgit v1.2.1