cpython: 68a7d77a90c3 (original) (raw)

Mercurial > cpython

changeset 85758:68a7d77a90c3 3.3

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

Serhiy Storchaka storchaka@gmail.com
date	Fri, 20 Sep 2013 21:24:39 +0300
parents	2b7f11ba871c
children	0e794f6396fb 08c45e18e7b2
files	Lib/sre_compile.py Lib/sre_constants.py Lib/sre_parse.py Misc/NEWS
diffstat	4 files changed, 8 insertions(+), 3 deletions(-)[+] [-] Lib/sre_compile.py 1 Lib/sre_constants.py 6 Lib/sre_parse.py 1 Misc/NEWS 3

line wrap: on

line diff

--- 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"

--- 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?

--- 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 = "+?{"

--- 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.