]> granicus.if.org Git - python/commitdiff
Captured IO streams with embedded backslashes are always such a fun combination...
authorNick Coghlan <ncoghlan@gmail.com>
Mon, 13 Dec 2010 16:32:51 +0000 (16:32 +0000)
committerNick Coghlan <ncoghlan@gmail.com>
Mon, 13 Dec 2010 16:32:51 +0000 (16:32 +0000)
Lib/test/test_tempfile.py

index 536e1ca61eee359899fa49f3ffd18183cc406cea..cf8fc33ad8714a8cce8301b710132d6f10cd4ce8 100644 (file)
@@ -989,7 +989,13 @@ class test_TemporaryDirectory(TC):
         #   Issue 10888: may write to stderr if modules are nulled out
         #   ResourceWarning will be triggered by __del__
         with self.do_create() as dir:
-            d = self.do_create(dir=dir)
+            if os.sep != '\\':
+                # Embed a backslash in order to make sure string escaping
+                # in the displayed error message is dealt with correctly
+                suffix = '\\check_backslash_handling'
+            else:
+                suffix = ''
+            d = self.do_create(dir=dir, suf=suffix)
 
             #Check for the Issue 10888 message
             modules = [os, os.path]
@@ -998,7 +1004,7 @@ class test_TemporaryDirectory(TC):
             with support.captured_stderr() as err:
                 with NulledModules(*modules):
                     d.cleanup()
-            message = err.getvalue()
+            message = err.getvalue().replace('\\\\', '\\')
             self.assertIn("while cleaning up",  message)
             self.assertIn(d.name,  message)