Bug #1202493: Fixing SRE parser to handle '{}' as perl does, rather than
considering it exactly like a '*'.
diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py
index 33b399e..319bf43 100644
--- a/Lib/sre_parse.py
+++ b/Lib/sre_parse.py
@@ -485,6 +485,9 @@
elif this == "+":
min, max = 1, MAXREPEAT
elif this == "{":
+ if source.next == "}":
+ subpatternappend((LITERAL, ord(this)))
+ continue
here = source.tell()
min, max = 0, MAXREPEAT
lo = hi = ""
diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py
index eab995d..9755005 100644
--- a/Lib/test/test_re.py
+++ b/Lib/test/test_re.py
@@ -297,6 +297,9 @@
self.assertNotEqual(re.match("^x{1,4}?$", "xxx"), None)
self.assertNotEqual(re.match("^x{3,4}?$", "xxx"), None)
+ self.assertEqual(re.match("^x{}$", "xxx"), None)
+ self.assertNotEqual(re.match("^x{}$", "x{}"), None)
+
def test_getattr(self):
self.assertEqual(re.match("(a)", "a").pos, 0)
self.assertEqual(re.match("(a)", "a").endpos, 1)
diff --git a/Misc/NEWS b/Misc/NEWS
index 29f2b44..27483d4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -443,6 +443,10 @@
from the input stream, so that the output is a byte string in the correct
encoding instead of a unicode string.
+- Bug #1202493: Fixing SRE parser to handle '{}' as perl does, rather than
+ considering it exactly like a '*'.
+
+
Build
-----