diff options
| author | Guido van Rossum <guido@python.org> | 2007-04-27 23:53:51 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-04-27 23:53:51 (GMT) |
| commit | 572dbf8f1320c0b34b9c786e5c30ba4a4b61b292 (patch) | |
| tree | 27763a28b40b577302161008a00539649e2a536d /Lib/sre_compile.py | |
| parent | d4617f24caa1827106f5ca5e74655adf919ea499 (diff) | |
| download | cpython-572dbf8f1320c0b34b9c786e5c30ba4a4b61b292.zip cpython-572dbf8f1320c0b34b9c786e5c30ba4a4b61b292.tar.gz cpython-572dbf8f1320c0b34b9c786e5c30ba4a4b61b292.tar.bz2 | |
Checkpoint. Manipulated things so that string literals are always
unicode, and a few other compensating changes, e.g. str <- unicode,
chr <- unichr, and repr() of a unicode string no longer starts
with 'u'. Lots of unit tests are broken, but some basic things
work, in particular distutils works so the extensions can be built,
and test_builtin.py works.
Diffstat (limited to 'Lib/sre_compile.py')
| -rw-r--r-- | Lib/sre_compile.py | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/Lib/sre_compile.py b/Lib/sre_compile.py index f6cbd7b..4f2fb04 100644 --- a/Lib/sre_compile.py +++ b/Lib/sre_compile.py @@ -470,18 +470,8 @@ def _compile_info(code, pattern, flags): _compile_charset(charset, flags, code) code[skip] = len(code) - skip -try: - unicode -except NameError: - 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 + return isinstance(obj, basestring) def _code(p, flags): |