https://github.com/python/cpython/commit/10adcb4a2b67eb30f807ed01495b50a7b2064735
commit: 10adcb4a2b67eb30f807ed01495b50a7b2064735
branch: 3.12
author: Miss Islington (bot) <31488909+miss-isling...@users.noreply.github.com>
committer: ambv <luk...@langa.pl>
date: 2024-09-06T15:49:35+02:00
summary:
[3.12] gh-122798: Make tests for warnings in the re module more strict
(GH-122799) (#122805)
(cherry picked from commit d2e5be1f39bc3d48c7bc8c146c4bcadee266672a)
Co-authored-by: Serhiy Storchaka <storch...@gmail.com>
files:
M Lib/test/test_re.py
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
index e279412efbc52c..cb3e74639857bc 100644
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -1052,47 +1052,76 @@ def test_not_literal(self):
def test_possible_set_operations(self):
s = bytes(range(128)).decode()
- with self.assertWarns(FutureWarning):
+ with self.assertWarnsRegex(FutureWarning, 'Possible set difference')
as w:
p = re.compile(r'[0-9--1]')
+ self.assertEqual(w.filename, __file__)
self.assertEqual(p.findall(s), list('-./0123456789'))
+ with self.assertWarnsRegex(FutureWarning, 'Possible set difference')
as w:
+ self.assertEqual(re.findall(r'[0-9--2]', s), list('-./0123456789'))
+ self.assertEqual(w.filename, __file__)
+
self.assertEqual(re.findall(r'[--1]', s), list('-./01'))
- with self.assertWarns(FutureWarning):
+
+ with self.assertWarnsRegex(FutureWarning, 'Possible set difference')
as w:
p = re.compile(r'[%--1]')
+ self.assertEqual(w.filename, __file__)
self.assertEqual(p.findall(s), list("%&'()*+,-1"))
- with self.assertWarns(FutureWarning):
+
+ with self.assertWarnsRegex(FutureWarning, 'Possible set difference ')
as w:
p = re.compile(r'[%--]')
+ self.assertEqual(w.filename, __file__)
self.assertEqual(p.findall(s), list("%&'()*+,-"))
- with self.assertWarns(FutureWarning):
+ with self.assertWarnsRegex(FutureWarning, 'Possible set intersection
') as w:
p = re.compile(r'[0-9&&1]')
+ self.assertEqual(w.filename, __file__)
self.assertEqual(p.findall(s), list('&0123456789'))
- with self.assertWarns(FutureWarning):
+ with self.assertWarnsRegex(FutureWarning, 'Possible set intersection
') as w:
+ self.assertEqual(re.findall(r'[0-8&&1]', s), list('&012345678'))
+ self.assertEqual(w.filename, __file__)
+
+ with self.assertWarnsRegex(FutureWarning, 'Possible set intersection
') as w:
p = re.compile(r'[\d&&1]')
+ self.assertEqual(w.filename, __file__)
self.assertEqual(p.findall(s), list('&0123456789'))
+
self.assertEqual(re.findall(r'[&&1]', s), list('&1'))
- with self.assertWarns(FutureWarning):
+ with self.assertWarnsRegex(FutureWarning, 'Possible set union ') as w:
p = re.compile(r'[0-9||a]')
+ self.assertEqual(w.filename, __file__)
self.assertEqual(p.findall(s), list('0123456789a|'))
- with self.assertWarns(FutureWarning):
+
+ with self.assertWarnsRegex(FutureWarning, 'Possible set union ') as w:
p = re.compile(r'[\d||a]')
+ self.assertEqual(w.filename, __file__)
self.assertEqual(p.findall(s), list('0123456789a|'))
+
self.assertEqual(re.findall(r'[||1]', s), list('1|'))
- with self.assertWarns(FutureWarning):
+ with self.assertWarnsRegex(FutureWarning, 'Possible set symmetric
difference ') as w:
p = re.compile(r'[0-9~~1]')
+ self.assertEqual(w.filename, __file__)
self.assertEqual(p.findall(s), list('0123456789~'))
- with self.assertWarns(FutureWarning):
+
+ with self.assertWarnsRegex(FutureWarning, 'Possible set symmetric
difference ') as w:
p = re.compile(r'[\d~~1]')
+ self.assertEqual(w.filename, __file__)
self.assertEqual(p.findall(s), list('0123456789~'))
+
self.assertEqual(re.findall(r'[~~1]', s), list('1~'))
- with self.assertWarns(FutureWarning):
+ with self.assertWarnsRegex(FutureWarning, 'Possible nested set ') as w:
p = re.compile(r'[[0-9]|]')
+ self.assertEqual(w.filename, __file__)
self.assertEqual(p.findall(s), list('0123456789[]'))
+ with self.assertWarnsRegex(FutureWarning, 'Possible nested set ') as w:
+ self.assertEqual(re.findall(r'[[0-8]|]', s), list('012345678[]'))
+ self.assertEqual(w.filename, __file__)
- with self.assertWarns(FutureWarning):
+ with self.assertWarnsRegex(FutureWarning, 'Possible nested set ') as w:
p = re.compile(r'[[:digit:]|]')
+ self.assertEqual(w.filename, __file__)
self.assertEqual(p.findall(s), list(':[]dgit'))
def test_search_coverage(self):
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
