From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 20 Sep 2013 18:24:39 +0000 (+0300)
Subject: Issue #18050: Fixed an incompatibility of the re module with Python 3.3.0
X-Git-Tag: v3.4.0a3~41^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c8bf95cfc58d92c365abd4c958feb15f872b2a29;p=thirdparty%2FPython%2Fcpython.git

Issue #18050: Fixed an incompatibility of the re module with Python 3.3.0
binaries.
---

diff --git a/Lib/sre_compile.py b/Lib/sre_compile.py
index 9f59c770dc49..b6b377f25bc7 100644
--- a/Lib/sre_compile.py
+++ b/Lib/sre_compile.py
@@ -13,7 +13,6 @@
 import _sre, sys
 import sre_parse
 from sre_constants import *
-from _sre import MAXREPEAT
 
 assert _sre.MAGIC == MAGIC, "SRE module mismatch"
 
diff --git a/Lib/sre_constants.py b/Lib/sre_constants.py
index 5898d5411a93..3fb5eac3228f 100644
--- a/Lib/sre_constants.py
+++ b/Lib/sre_constants.py
@@ -15,7 +15,11 @@
 
 MAGIC = 20031017
 
-from _sre import MAXREPEAT
+try:
+    from _sre import MAXREPEAT
+except ImportError:
+    import _sre
+    MAXREPEAT = _sre.MAXREPEAT = 65535
 
 # SRE standard exception (access as sre.error)
 # should this really be here?
diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py
index f26229fc2870..8a77790b08d8 100644
--- a/Lib/sre_parse.py
+++ b/Lib/sre_parse.py
@@ -15,7 +15,6 @@
 import sys
 
 from sre_constants import *
-from _sre import MAXREPEAT
 
 SPECIAL_CHARS = ".\\[{()*+?^$|"
 REPEAT_CHARS = "*+?{"
diff --git a/Misc/NEWS b/Misc/NEWS
index 8570371e6de2..451aba63bae4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -68,6 +68,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #18050: Fixed an incompatibility of the re module with Python 3.3.0
+  binaries.
+
 - Issue #19037: The mailbox module now makes all changes to maildir files
   before moving them into place, to avoid race conditions with other programs
   that may be accessing the maildir directory.