From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 7 Sep 2016 15:54:35 +0000 (-0700)
Subject: new and exciting shutdown error on windows
X-Git-Tag: v3.6.0b1~347
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e2ffe29738edc4a643d7f14842c10eeeee273bec;p=thirdparty%2FPython%2Fcpython.git

new and exciting shutdown error on windows
---

diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index c48ec3a23966..f9f5d7a7ee8a 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -3230,7 +3230,8 @@ def _to_memoryview(buf):
 
 class CTextIOWrapperTest(TextIOWrapperTest):
     io = io
-    shutdown_error = "RuntimeError: could not find io module state"
+    shutdown_error = ("ImportError: sys.meta_path is None"
+        if os.name == "nt" else "RuntimeError: could not find io module state")
 
     def test_initialization(self):
         r = self.BytesIO(b"\xc3\xa9\n\n")