From: Nick Coghlan <ncoghlan@gmail.com>
Date: Wed, 18 Nov 2009 11:35:25 +0000 (+0000)
Subject: Merged revisions 76362 via svnmerge from
X-Git-Tag: v3.2a1~2162
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=16eb0fbbd015de7b0116d984a08df8d05ef90e17;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 76362 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76362 | nick.coghlan | 2009-11-18 21:27:53 +1000 (Wed, 18 Nov 2009) | 1 line

  Correctly escape arbitrary error message text in the runpy unit tests
........
---

diff --git a/Lib/test/test_runpy.py b/Lib/test/test_runpy.py
index bd22814eec8d..88e05fedfbef 100644
--- a/Lib/test/test_runpy.py
+++ b/Lib/test/test_runpy.py
@@ -3,6 +3,7 @@ import unittest
 import os
 import os.path
 import sys
+import re
 import tempfile
 from test.support import verbose, run_unittest, forget
 from test.script_helper import (temp_dir, make_script, compile_script,
@@ -290,8 +291,7 @@ argv0 = sys.argv[0]
         self.assertEqual(result["__package__"], expected_package)
 
     def _check_import_error(self, script_name, msg):
-        # Double backslashes to handle path separators on Windows
-        msg = msg.replace("\\", "\\\\")
+        msg = re.escape(msg)
         self.assertRaisesRegexp(ImportError, msg, run_path, script_name)
 
     def test_basic_script(self):