languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-10-14 22:49:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

bpo-47066: Convert a warning about flags not at the start of the regular expression into error (GH-31994)

Browse source
This commit is contained in:
Serhiy Storchaka 2022-03-19 16:10:44 +02:00 committed by GitHub
parent cb7874f49d
commit 92a6abf72e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Doc/library/re.rst
View file

@ -299,6 +299,9 @@ The special characters are:
:func:`re.compile` function. Flags should be used first in the
expression string.
.. versionchanged:: 3.11
This construction can only be used at the start of the expression.
.. index:: single: (?:; in regular expressions
``(?:...)``

5
Doc/whatsnew/3.11.rst
View file

@ -688,6 +688,11 @@ Changes in the Python API
if no locale is specified.
(Contributed by Victor Stinner in :issue:`46659`.)
* Global inline flags (e.g. ``(?i)``) can now only be used at the start of
the regular expressions. Using them not at the start of expression was
deprecated since Python 3.6.
(Contributed by Serhiy Storchaka in :issue:`47066`.)
Build Changes
=============

13
Lib/sre_parse.py
View file

@ -805,16 +805,9 @@ def _parse(source, state, verbose, nested, first=False):
flags = _parse_flags(source, state, char)
if flags is None: # global flags
if not first or subpattern:
import warnings
warnings.warn(
'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
)
raise source.error('global flags not at the start '
'of the expression',
source.tell() - start)
if (state.flags & SRE_FLAG_VERBOSE) and not verbose:
raise Verbose
continue

66
Lib/test/test_re.py
View file

@ -1439,66 +1439,22 @@ def test_inline_flags(self):
self.assertTrue(re.match('(?x) (?i) ' + upper_char, lower_char))
self.assertTrue(re.match(' (?x) (?i) ' + upper_char, lower_char, re.X))
p = upper_char + '(?i)'
with self.assertWarns(DeprecationWarning) as warns:
self.assertTrue(re.match(p, lower_char))
self.assertEqual(
str(warns.warnings[0].message),
'Flags not at the start of the expression %r'
' but at position 1' % p
)
self.assertEqual(warns.warnings[0].filename, __file__)
p = upper_char + '(?i)%s' % ('.?' * 100)
with self.assertWarns(DeprecationWarning) as warns:
self.assertTrue(re.match(p, lower_char))
self.assertEqual(
str(warns.warnings[0].message),
'Flags not at the start of the expression %r (truncated)'
' but at position 1' % p[:20]
)
self.assertEqual(warns.warnings[0].filename, __file__)
msg = "global flags not at the start of the expression"
self.checkPatternError(upper_char + '(?i)', msg, 1)
# bpo-30605: Compiling a bytes instance regex was throwing a BytesWarning
with warnings.catch_warnings():
warnings.simplefilter('error', BytesWarning)
p = b'A(?i)'
with self.assertWarns(DeprecationWarning) as warns:
self.assertTrue(re.match(p, b'a'))
self.assertEqual(
str(warns.warnings[0].message),
'Flags not at the start of the expression %r'
' but at position 1' % p
)
self.assertEqual(warns.warnings[0].filename, __file__)
self.checkPatternError(b'A(?i)', msg, 1)
with self.assertWarns(DeprecationWarning):
self.assertTrue(re.match('(?s).(?i)' + upper_char, '\n' + lower_char))
with self.assertWarns(DeprecationWarning):
self.assertTrue(re.match('(?i) ' + upper_char + ' (?x)', lower_char))
with self.assertWarns(DeprecationWarning):
self.assertTrue(re.match(' (?x) (?i) ' + upper_char, lower_char))
with self.assertWarns(DeprecationWarning):
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) as warns:
self.assertTrue(re.match('(?:(?i)' + upper_char + ')', lower_char))
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__)
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__)
self.checkPatternError('(?s).(?i)' + upper_char, msg, 5)
self.checkPatternError('(?i) ' + upper_char + ' (?x)', msg, 7)
self.checkPatternError(' (?x) (?i) ' + upper_char, msg, 1)
self.checkPatternError('^(?i)' + upper_char, msg, 1)
self.checkPatternError('$|(?i)' + upper_char, msg, 2)
self.checkPatternError('(?:(?i)' + upper_char + ')', msg, 3)
self.checkPatternError('(^)?(?(1)(?i)' + upper_char + ')', msg, 9)
self.checkPatternError('($)?(?(1)|(?i)' + upper_char + ')', msg, 10)
def test_dollar_matches_twice(self):

3
Misc/NEWS.d/next/Library/2022-03-19-14-12-23.bpo-47066.we3YFx.rst Normal file
View file

@ -0,0 +1,3 @@
Global inline flags (e.g. ``(?i)``) can now only be used at the start of the
regular expressions. Using them not at the start of expression was
deprecated since Python 3.6.