From: Steve Dower <steve.dower@microsoft.com>
Date: Fri, 9 Sep 2016 16:21:01 +0000 (-0700)
Subject: Fixes expected error when getting encoding while shutting down.
X-Git-Tag: v3.6.0b1~210
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d5cf8a73e02a9b002323e4d72169d89782a4115;p=thirdparty%2FPython%2Fcpython.git

Fixes expected error when getting encoding while shutting down.
---

diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 1115d9f1c284..c48ec3a23966 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -3276,7 +3276,7 @@ class CTextIOWrapperTest(TextIOWrapperTest):
 
 class PyTextIOWrapperTest(TextIOWrapperTest):
     io = pyio
-    shutdown_error = "ImportError: sys.meta_path is None, Python is likely shutting down"
+    shutdown_error = "LookupError: unknown encoding: ascii"
 
 
 class IncrementalNewlineDecoderTest(unittest.TestCase):