diff options
| author | Larry Hastings <larry@hastings.org> | 2014-02-11 00:15:46 -0800 |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2014-02-11 00:15:46 -0800 |
| commit | 3f99504c08ebca685271c32289f8907bc456e1fc (patch) | |
| tree | deb0b2d3284cec1323ad0da34f96107ea3f64576 /Lib/test/test_io.py | |
| parent | 4cce8f2f40cc15235f44b3a47fec0444ed75e9fe (diff) | |
| parent | 06847d9c8c30715c077e083de1c511e399af75f1 (diff) | |
| download | cpython-git-3f99504c08ebca685271c32289f8907bc456e1fc.tar.gz | |
Merge Python 3.4.0rc1 release branch.
Diffstat (limited to 'Lib/test/test_io.py')
| -rw-r--r-- | Lib/test/test_io.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index 23edee69ed..4182da3aae 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -2691,7 +2691,8 @@ class CTextIOWrapperTest(TextIOWrapperTest): class PyTextIOWrapperTest(TextIOWrapperTest): io = pyio - shutdown_error = "LookupError: unknown encoding: ascii" + #shutdown_error = "LookupError: unknown encoding: ascii" + shutdown_error = "TypeError: 'NoneType' object is not iterable" class IncrementalNewlineDecoderTest(unittest.TestCase): |