[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #11957: Restored re tests for passing count and maxsplit as positional

Sun Sep 25 13:39:49 EDT 2016

https://hg.python.org/cpython/rev/b39b09290718
changeset: 104061:b39b09290718
branch: 3.6
parent: 104058:ec3f5d21bec0
parent: 104060:216e8b809e4e
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sun Sep 25 20:39:04 2016 +0300
summary:
 Issue #11957: Restored re tests for passing count and maxsplit as positional
arguments.
files:
 Lib/test/test_re.py | 5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -102,6 +102,8 @@
 self.assertEqual(re.sub("(?i)b+", "x", "bbbb BBBB"), 'x x')
 self.assertEqual(re.sub(r'\d+', self.bump_num, '08.2 -2 23x99y'),
 '9.3 -3 24x100y')
+ self.assertEqual(re.sub(r'\d+', self.bump_num, '08.2 -2 23x99y', 3),
+ '9.3 -3 23x99y')
 self.assertEqual(re.sub(r'\d+', self.bump_num, '08.2 -2 23x99y', count=3),
 '9.3 -3 23x99y')
 
@@ -206,6 +208,7 @@
 
 def test_qualified_re_sub(self):
 self.assertEqual(re.sub('a', 'b', 'aaaaa'), 'bbbbb')
+ self.assertEqual(re.sub('a', 'b', 'aaaaa', 1), 'baaaa')
 self.assertEqual(re.sub('a', 'b', 'aaaaa', count=1), 'baaaa')
 
 def test_bug_114660(self):
@@ -291,6 +294,7 @@
 self.assertEqual(re.subn("b+", "x", "bbbb BBBB"), ('x BBBB', 1))
 self.assertEqual(re.subn("b+", "x", "xyz"), ('xyz', 0))
 self.assertEqual(re.subn("b*", "x", "xyz"), ('xxxyxzx', 4))
+ self.assertEqual(re.subn("b*", "x", "xyz", 2), ('xxxyz', 2))
 self.assertEqual(re.subn("b*", "x", "xyz", count=2), ('xxxyz', 2))
 
 def test_re_split(self):
@@ -347,6 +351,7 @@
 self.assertTypedEqual(re.split(sep, ':a:b::c'), expected)
 
 def test_qualified_re_split(self):
+ self.assertEqual(re.split(":", ":a:b::c", 2), ['', 'a', 'b::c'])
 self.assertEqual(re.split(":", ":a:b::c", maxsplit=2), ['', 'a', 'b::c'])
 self.assertEqual(re.split(':', 'a:b:c:d', maxsplit=2), ['a', 'b', 'c:d'])
 self.assertEqual(re.split("(:)", ":a:b::c", maxsplit=2),
-- 
Repository URL: https://hg.python.org/cpython
