From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 26 Apr 2022 05:45:24 +0000 (-0700)
Subject: gh-91916: Fix test_runpy on non-UTF-8 locale (GH-91920)
X-Git-Tag: v3.9.13~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=653a66668df818aafb76f968247cb02d2f9cd405;p=thirdparty%2FPython%2Fcpython.git

gh-91916: Fix test_runpy on non-UTF-8 locale (GH-91920)


If use a non-builtin codec, partially implemented in Python
(e.g. ISO-8859-15), a new RecursionError (with empty error message)
can be raised while handle a RecursionError.

Testing for error message was needed to distinguish
a recursion error from arbitrary RuntimeError. After introducing
RecursionError, it became unnecessary.
(cherry picked from commit a568585069174cec35ce26cdf4d4862c634d9f6d)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
---

diff --git a/Lib/test/test_runpy.py b/Lib/test/test_runpy.py
index 4aaf75b1bceb..c734f0d6ce2d 100644
--- a/Lib/test/test_runpy.py
+++ b/Lib/test/test_runpy.py
@@ -740,8 +740,7 @@ class RunPathTestCase(unittest.TestCase, CodeExecutionMixin):
                       "runpy.run_path(%r)\n") % dummy_dir
             script_name = self._make_test_script(script_dir, mod_name, source)
             zip_name, fname = make_zip_script(script_dir, 'test_zip', script_name)
-            msg = "recursion depth exceeded"
-            self.assertRaisesRegex(RecursionError, msg, run_path, zip_name)
+            self.assertRaises(RecursionError, run_path, zip_name)
 
     def test_encoding(self):
         with temp_dir() as script_dir: