Addendum to #764548: restore 2.1 compatibility.

diff --git a/Lib/sre.py b/Lib/sre.py
index 7910c83eac34a391bad061cc13ae15bd5082bff4..ffe2bc36e6439320c5cbc2ee691910f9e8a21750 100644 (file)
--- a/Lib/sre.py
+++ b/Lib/sre.py
@@ -221,7 +221,7 @@ def _compile(*key):
     pattern, flags = key
     if isinstance(pattern, _pattern_type):
         return pattern
-    if not isinstance(pattern, sre_compile.STRING_TYPES):
+    if not sre_compile.isstring(pattern):
         raise TypeError, "first argument must be string or compiled pattern"
     try:
         p = sre_compile.compile(pattern, flags)

diff --git a/Lib/sre_compile.py b/Lib/sre_compile.py
index 96f337a7794faa4d2a5e05093c40371bc47880a8..8a26a0f43d2f32b901d06b4e97df5739b875ed06 100644 (file)
--- a/Lib/sre_compile.py
+++ b/Lib/sre_compile.py
@@ -431,10 +431,16 @@ def _compile_info(code, pattern, flags):
 try:
     unicode
 except NameError:
-    STRING_TYPES = type("")
+    STRING_TYPES = (type(""),)
 else:
     STRING_TYPES = (type(""), type(unicode("")))
 
+def isstring(obj):
+    for tp in STRING_TYPES:
+        if isinstance(obj, tp):
+            return 1
+    return 0
+
 def _code(p, flags):
 
     flags = p.pattern.flags | flags
@@ -453,7 +459,7 @@ def _code(p, flags):
 def compile(p, flags=0):
     # internal: convert pattern list to internal format
 
-    if isinstance(p, STRING_TYPES):
+    if isstring(p):
         import sre_parse
         pattern = p
         p = sre_parse.parse(p, flags)