[Python-3000-checkins] r63102 - in python/branches/py3k: Lib/sre.py Lib/test/test_re.py Misc/NEWS

[brett.cannon]

Author: brett.cannon
Date: Mon May 12 00:47:58 2008
New Revision: 63102

Log:
Remove the sre module.


Removed:
   python/branches/py3k/Lib/sre.py
Modified:
   python/branches/py3k/Lib/test/test_re.py
   python/branches/py3k/Misc/NEWS

Deleted: python/branches/py3k/Lib/sre.py
==============================================================================
--- python/branches/py3k/Lib/sre.py	Mon May 12 00:47:58 2008
+++ (empty file)
@@ -1,13 +0,0 @@
-"""This file is only retained for backwards compatibility.
-It will be removed in the future.  sre was moved to re in version 2.5.
-"""
-
-import warnings
-warnings.warn("The sre module is deprecated, please import re.",
-              DeprecationWarning, 2)
-
-from re import *
-from re import __all__
-
-# old pickles expect the _compile() reconstructor in this module
-from re import _compile

Modified: python/branches/py3k/Lib/test/test_re.py
==============================================================================
--- python/branches/py3k/Lib/test/test_re.py	(original)
+++ python/branches/py3k/Lib/test/test_re.py	Mon May 12 00:47:58 2008
@@ -434,16 +434,6 @@
         self.assertEqual(pat.match(p) is not None, True)
         self.assertEqual(pat.match(p).span(), (0,256))
 
-    def test_pickling(self):
-        import pickle
-        self.pickle_test(pickle)
-        # old pickles expect the _compile() reconstructor in sre module
-        import warnings
-        with catch_warning():
-            warnings.filterwarnings("ignore", "The sre module is deprecated",
-                                    DeprecationWarning)
-            from sre import _compile
-
     def pickle_test(self, pickle):
         oldpat = re.compile('a(?:b|(c|e){1,2}?|d)+?(.)')
         s = pickle.dumps(oldpat)

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Mon May 12 00:47:58 2008
@@ -21,6 +21,8 @@
 Library
 -------
 
+- The sre module has been removed.
+
 - The PixMapWrapper module has been renamed to pixmapwrapper.
 
 - The Queue module has been renamed to queue.