diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2017-05-16 12:16:15 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-16 12:16:15 (GMT) |
| commit | c7ac7280c321b3c1679fe5f657a6be0f86adf173 (patch) | |
| tree | ce201ce147377ada98b1b4ad55526e2eecfaaa8f /Lib/test/test_re.py | |
| parent | 87fa8a780e9045a26c735f085c07bba4b2d0be60 (diff) | |
| download | cpython-c7ac7280c321b3c1679fe5f657a6be0f86adf173.zip cpython-c7ac7280c321b3c1679fe5f657a6be0f86adf173.tar.gz cpython-c7ac7280c321b3c1679fe5f657a6be0f86adf173.tar.bz2 | |
bpo-30375: Correct the stacklevel of regex compiling warnings. (#1595)
Warnings emitted when compile a regular expression now always point
to the line in the user code. Previously they could point into inners
of the re module if emitted from inside of groups or conditionals.
Diffstat (limited to 'Lib/test/test_re.py')
| -rw-r--r-- | Lib/test/test_re.py | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py index 1bb2654..027df40 100644 --- a/Lib/test/test_re.py +++ b/Lib/test/test_re.py @@ -1370,6 +1370,7 @@ class ReTests(unittest.TestCase): str(warns.warnings[0].message), 'Flags not at the start of the expression %s' % p ) + self.assertEqual(warns.warnings[0].filename, __file__) p = upper_char + '(?i)%s' % ('.?' * 100) with self.assertWarns(DeprecationWarning) as warns: @@ -1378,6 +1379,7 @@ class ReTests(unittest.TestCase): str(warns.warnings[0].message), 'Flags not at the start of the expression %s (truncated)' % p[:20] ) + self.assertEqual(warns.warnings[0].filename, __file__) with self.assertWarns(DeprecationWarning): self.assertTrue(re.match('(?s).(?i)' + upper_char, '\n' + lower_char)) @@ -1389,14 +1391,23 @@ class ReTests(unittest.TestCase): self.assertTrue(re.match('^(?i)' + upper_char, lower_char)) with self.assertWarns(DeprecationWarning): self.assertTrue(re.match('$|(?i)' + upper_char, lower_char)) - with self.assertWarns(DeprecationWarning): + with self.assertWarns(DeprecationWarning) as warns: self.assertTrue(re.match('(?:(?i)' + upper_char + ')', lower_char)) - with self.assertWarns(DeprecationWarning): + self.assertRegex(str(warns.warnings[0].message), + 'Flags not at the start') + self.assertEqual(warns.warnings[0].filename, __file__) + with self.assertWarns(DeprecationWarning) as warns: self.assertTrue(re.fullmatch('(^)?(?(1)(?i)' + upper_char + ')', lower_char)) - with self.assertWarns(DeprecationWarning): + self.assertRegex(str(warns.warnings[0].message), + 'Flags not at the start') + self.assertEqual(warns.warnings[0].filename, __file__) + with self.assertWarns(DeprecationWarning) as warns: self.assertTrue(re.fullmatch('($)?(?(1)|(?i)' + upper_char + ')', lower_char)) + self.assertRegex(str(warns.warnings[0].message), + 'Flags not at the start') + self.assertEqual(warns.warnings[0].filename, __file__) def test_dollar_matches_twice(self): |