diff options
| -rw-r--r-- | Lib/test/test_tokenize.py | 13 | ||||
| -rw-r--r-- | Lib/tokenize.py | 15 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 25 insertions, 5 deletions
diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py index f72b2c6..4a82229 100644 --- a/Lib/test/test_tokenize.py +++ b/Lib/test/test_tokenize.py @@ -531,6 +531,7 @@ pass the '-ucompiler' option to process the full directory. True Evil tabs + >>> dump_tokens("def f():\\n\\tif x\\n \\tpass") ENCODING 'utf-8' (0, 0) (0, 0) NAME 'def' (1, 0) (1, 3) @@ -547,6 +548,18 @@ Evil tabs NAME 'pass' (3, 9) (3, 13) DEDENT '' (4, 0) (4, 0) DEDENT '' (4, 0) (4, 0) + +Non-ascii identifiers + + >>> dump_tokens("Örter = 'places'\\ngrün = 'green'") + ENCODING 'utf-8' (0, 0) (0, 0) + NAME 'Örter' (1, 0) (1, 5) + OP '=' (1, 6) (1, 7) + STRING "'places'" (1, 8) (1, 16) + NEWLINE '\\n' (1, 16) (1, 17) + NAME 'grün' (2, 0) (2, 4) + OP '=' (2, 5) (2, 6) + STRING "'green'" (2, 7) (2, 14) """ from test import support diff --git a/Lib/tokenize.py b/Lib/tokenize.py index 519dfa5..51b49e4 100644 --- a/Lib/tokenize.py +++ b/Lib/tokenize.py @@ -92,7 +92,7 @@ def maybe(*choices): return group(*choices) + '?' Whitespace = r'[ \f\t]*' Comment = r'#[^\r\n]*' Ignore = Whitespace + any(r'\\\r?\n' + Whitespace) + maybe(Comment) -Name = r'[a-zA-Z_]\w*' +Name = r'\w+' Hexnumber = r'0[xX][0-9a-fA-F]+' Binnumber = r'0[bB][01]+' @@ -142,9 +142,12 @@ ContStr = group(r"[bB]?[rR]?'[^\n'\\]*(?:\\.[^\n'\\]*)*" + PseudoExtras = group(r'\\\r?\n', Comment, Triple) PseudoToken = Whitespace + group(PseudoExtras, Number, Funny, ContStr, Name) +def _compile(expr): + return re.compile(expr, re.UNICODE) + tokenprog, pseudoprog, single3prog, double3prog = map( - re.compile, (Token, PseudoToken, Single3, Double3)) -endprogs = {"'": re.compile(Single), '"': re.compile(Double), + _compile, (Token, PseudoToken, Single3, Double3)) +endprogs = {"'": _compile(Single), '"': _compile(Double), "'''": single3prog, '"""': double3prog, "r'''": single3prog, 'r"""': double3prog, "b'''": single3prog, 'b"""': double3prog, @@ -171,6 +174,8 @@ for t in ("'", '"', "bR'", 'bR"', "BR'", 'BR"' ): single_quoted[t] = t +del _compile + tabsize = 8 class TokenError(Exception): pass @@ -393,7 +398,7 @@ def tokenize(readline): def _tokenize(readline, encoding): lnum = parenlev = continued = 0 - namechars, numchars = string.ascii_letters + '_', '0123456789' + numchars = '0123456789' contstr, needcont = '', 0 contline = None indents = [0] @@ -520,7 +525,7 @@ def _tokenize(readline, encoding): break else: # ordinary string yield TokenInfo(STRING, token, spos, epos, line) - elif initial in namechars: # ordinary name + elif initial.isidentifier(): # ordinary name yield TokenInfo(NAME, token, spos, epos, line) elif initial == '\\': # continued stmt continued = 1 @@ -12,6 +12,8 @@ What's New in Python 3.2 Alpha 2? Core and Builtins ----------------- +- Issue #9712: Fix tokenize on identifiers that start with non-ascii names. + - Issue #9688: __basicsize__ and __itemsize__ must be accessed as Py_ssize_t. - Issue #9684: Added a definition for SIZEOF_WCHAR_T to PC/pyconfig.h, |