Skip to content

Commit

Permalink
bpo-39394: Improve warning message in the re module (GH-31988)
Browse files Browse the repository at this point in the history
A warning about inline flags not at the start of the regular
expression now contains the position of the flag.
(cherry picked from commit 4142961)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
  • Loading branch information
miss-islington and serhiy-storchaka committed Mar 19, 2022
1 parent c1f327f commit 906f1a4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
4 changes: 3 additions & 1 deletion Lib/sre_parse.py
Expand Up @@ -807,9 +807,11 @@ def _parse(source, state, verbose, nested, first=False):
if not first or subpattern:
import warnings
warnings.warn(
'Flags not at the start of the expression %r%s' % (
'Flags not at the start of the expression %r%s'
' but at position %d' % (
source.string[:20], # truncate long regexes
' (truncated)' if len(source.string) > 20 else '',
start,
),
DeprecationWarning, stacklevel=nested + 6
)
Expand Down
9 changes: 6 additions & 3 deletions Lib/test/test_re.py
Expand Up @@ -1444,7 +1444,8 @@ def test_inline_flags(self):
self.assertTrue(re.match(p, lower_char))
self.assertEqual(
str(warns.warnings[0].message),
'Flags not at the start of the expression %r' % p
'Flags not at the start of the expression %r'
' but at position 1' % p
)
self.assertEqual(warns.warnings[0].filename, __file__)

Expand All @@ -1453,7 +1454,8 @@ def test_inline_flags(self):
self.assertTrue(re.match(p, lower_char))
self.assertEqual(
str(warns.warnings[0].message),
'Flags not at the start of the expression %r (truncated)' % p[:20]
'Flags not at the start of the expression %r (truncated)'
' but at position 1' % p[:20]
)
self.assertEqual(warns.warnings[0].filename, __file__)

Expand All @@ -1465,7 +1467,8 @@ def test_inline_flags(self):
self.assertTrue(re.match(p, b'a'))
self.assertEqual(
str(warns.warnings[0].message),
'Flags not at the start of the expression %r' % p
'Flags not at the start of the expression %r'
' but at position 1' % p
)
self.assertEqual(warns.warnings[0].filename, __file__)

Expand Down
@@ -0,0 +1,2 @@
A warning about inline flags not at the start of the regular expression now
contains the position of the flag.

0 comments on commit 906f1a4

Please sign in to comment.