Commit e5df857c authored by Žiga Seilnacht's avatar Žiga Seilnacht

Bug #1675967: re patterns pickled with older Python versions can

now be unpickled.
 (backport form rev. 54492)
parent 7ed0a658
...@@ -8,3 +8,6 @@ warnings.warn("The sre module is deprecated, please import re.", ...@@ -8,3 +8,6 @@ warnings.warn("The sre module is deprecated, please import re.",
from re import * from re import *
from re import __all__ from re import __all__
# old pickles expect the _compile() reconstructor in this module
from re import _compile
...@@ -414,6 +414,15 @@ class ReTests(unittest.TestCase): ...@@ -414,6 +414,15 @@ class ReTests(unittest.TestCase):
self.pickle_test(pickle) self.pickle_test(pickle)
import cPickle import cPickle
self.pickle_test(cPickle) self.pickle_test(cPickle)
# old pickles expect the _compile() reconstructor in sre module
import warnings
original_filters = warnings.filters[:]
try:
warnings.filterwarnings("ignore", "The sre module is deprecated",
DeprecationWarning)
from sre import _compile
finally:
warnings.filters = original_filters
def pickle_test(self, pickle): def pickle_test(self, pickle):
oldpat = re.compile('a(?:b|(c|e){1,2}?|d)+?(.)') oldpat = re.compile('a(?:b|(c|e){1,2}?|d)+?(.)')
......
...@@ -217,6 +217,9 @@ Extension Modules ...@@ -217,6 +217,9 @@ Extension Modules
Library Library
------- -------
- Bug #1675967: re patterns pickled with Python 2.4 and earlier can
now be unpickled with Python 2.5.
- Bug #1684254: webbrowser now uses shlex to split any command lines - Bug #1684254: webbrowser now uses shlex to split any command lines
given to get(). It also detects when you use '&' as the last argument given to get(). It also detects when you use '&' as the last argument
and creates a BackgroundBrowser then. and creates a BackgroundBrowser then.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment