mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 23:53:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-39394: Improve warning message in the re module (GH-31988)

Browse source 
A warning about inline flags not at the start of the regular
expression now contains the position of the flag.
(cherry picked from commit 4142961b9f)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This commit is contained in:
Miss Islington (bot) 2022-03-19 07:09:45 -07:00 • committed by GitHub
parent c1f327f30d
commit 906f1a4a95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/sre_parse.py
View file

@ -807,9 +807,11 @@ def _parse(source, state, verbose, nested, first=False):
if not first or subpattern: if not first or subpattern:
import warnings import warnings
warnings.warn( 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 source.string[:20], # truncate long regexes
' (truncated)' if len(source.string) > 20 else '', ' (truncated)' if len(source.string) > 20 else '',
start,
), ),
DeprecationWarning, stacklevel=nested + 6 DeprecationWarning, stacklevel=nested + 6
) )

9
Lib/test/test_re.py
View file

@ -1444,7 +1444,8 @@ class ReTests(unittest.TestCase):
self.assertTrue(re.match(p, lower_char)) self.assertTrue(re.match(p, lower_char))
self.assertEqual( self.assertEqual(
str(warns.warnings[0].message), 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__) self.assertEqual(warns.warnings[0].filename, __file__)
@ -1453,7 +1454,8 @@ class ReTests(unittest.TestCase):
self.assertTrue(re.match(p, lower_char)) self.assertTrue(re.match(p, lower_char))
self.assertEqual( self.assertEqual(
str(warns.warnings[0].message), 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__) self.assertEqual(warns.warnings[0].filename, __file__)
@ -1465,7 +1467,8 @@ class ReTests(unittest.TestCase):
self.assertTrue(re.match(p, b'a')) self.assertTrue(re.match(p, b'a'))
self.assertEqual( self.assertEqual(
str(warns.warnings[0].message), 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__) self.assertEqual(warns.warnings[0].filename, __file__)

2
Misc/NEWS.d/next/Library/2022-03-19-13-38-29.bpo-39394.7j6WL6.rst Normal file
View file

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