[Python-checkins] bpo-30445: Allow appended output in RecursionError message (#3356)

Victor Stinner webhook-mailer at python.org
Tue Sep 5 19:07:47 EDT 2017


https://github.com/python/cpython/commit/6fce7ea893dc3f69b607dd6ef48c2d3d0f6ca414
commit: 6fce7ea893dc3f69b607dd6ef48c2d3d0f6ca414
branch: 3.6
author: Victor Stinner <victor.stinner at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-09-06T01:07:44+02:00
summary:

bpo-30445: Allow appended output in RecursionError message (#3356)

Running under coverage sometimes causes 'in comparison' to be added to the end of the RecursionError message, which is acceptable.

Patched by Maria Mckinley

(cherry picked from commit 3480ef9dd3177be8c0d71a74853dca6e5b11fbe1)

files:
M Lib/test/test_traceback.py

diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index 7276bc7ee79..e4833535890 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -344,7 +344,8 @@ def f():
         # 2nd last line contains the repetition count
         self.assertEqual(actual[:-2], expected[:-2])
         self.assertRegex(actual[-2], expected[-2])
-        self.assertEqual(actual[-1], expected[-1])
+        # last line can have additional text appended
+        self.assertIn(expected[-1], actual[-1])
 
         # Check the recursion count is roughly as expected
         rec_limit = sys.getrecursionlimit()



More information about the Python-checkins mailing list