summaryrefslogtreecommitdiff
path: root/Lib/sre_compile.py
diff options
context:
space:
mode:
authorJust van Rossum <just@letterror.com>2003-07-02 21:37:16 +0000
committerJust van Rossum <just@letterror.com>2003-07-02 21:37:16 +0000
commit74902508dc395014dbdb9c2ed08263202e5d4e30 (patch)
tree81b32a9694015a6f76965a6c18b50aa37665c516 /Lib/sre_compile.py
parent12723baceab61f8812d68575c962696cc4e77fa1 (diff)
downloadcpython-git-74902508dc395014dbdb9c2ed08263202e5d4e30.tar.gz
Addendum to #764548: restore 2.1 compatibility.
Diffstat (limited to 'Lib/sre_compile.py')
-rw-r--r--Lib/sre_compile.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/Lib/sre_compile.py b/Lib/sre_compile.py
index 96f337a779..8a26a0f43d 100644
--- 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)