Remove pickle module dependency on 're'.

It appears there are still more dependencies.
oilshell · Aug 18, 2018 · 7521d112f4b1312575fc50f0ca8dcb8195cb8e4e · 7521d11
1 parent 6eadbd7
commit 7521d112f4b1312575fc50f0ca8dcb8195cb8e4e
Unified Split

Showing with 4 additions and 3 deletions.

+4 −3 Python-2.7.13/Lib/pickle.py
diff --git a/Python-2.7.13/Lib/pickle.py b/Python-2.7.13/Lib/pickle.py
@@ -32,7 +32,6 @@
 import marshal
 import sys
 import struct
-import re

 __all__ = ["PickleError", "PicklingError", "UnpicklingError", "Pickler",
           "Unpickler", "dump", "dumps", "load", "loads"]
@@ -162,8 +161,10 @@ def __init__(self, value):
 _tuplesize2code = [EMPTY_TUPLE, TUPLE1, TUPLE2, TUPLE3]


-__all__.extend([x for x in dir() if re.match("[A-Z][A-Z0-9_]+$",x)])
-del x
+# OVM_MAIN patch: Remove dependency on re module.  We're not doing 'import *'
+# anywhere.
+#__all__.extend([x for x in dir() if re.match("[A-Z][A-Z0-9_]+$",x)])
+#del x


 # Pickling machinery