diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-03 15:46:51 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-03 15:46:51 (GMT) |
| commit | fafa8b7797034aa799157172392a5b7721e1854a (patch) | |
| tree | 02a8a59d5561c54d43dd69136afc66c377be7dee /Lib/tokenize.py | |
| parent | 4af77a027680f2aa956a4d1c50947d6e2dbd0185 (diff) | |
| parent | 2cc3b4ba9ffa658784da03f14a0a068e2c61d1b3 (diff) | |
| download | cpython-fafa8b7797034aa799157172392a5b7721e1854a.zip cpython-fafa8b7797034aa799157172392a5b7721e1854a.tar.gz cpython-fafa8b7797034aa799157172392a5b7721e1854a.tar.bz2 | |
#16152: merge with 3.2.
Diffstat (limited to 'Lib/tokenize.py')
| -rw-r--r-- | Lib/tokenize.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/tokenize.py b/Lib/tokenize.py index d669412..cbf91ef 100644 --- a/Lib/tokenize.py +++ b/Lib/tokenize.py @@ -162,7 +162,7 @@ ContStr = group(StringPrefix + r"'[^\n'\\]*(?:\\.[^\n'\\]*)*" + group("'", r'\\\r?\n'), StringPrefix + r'"[^\n"\\]*(?:\\.[^\n"\\]*)*' + group('"', r'\\\r?\n')) -PseudoExtras = group(r'\\\r?\n', Comment, Triple) +PseudoExtras = group(r'\\\r?\n|\Z', Comment, Triple) PseudoToken = Whitespace + group(PseudoExtras, Number, Funny, ContStr, Name) def _compile(expr): @@ -555,6 +555,8 @@ def _tokenize(readline, encoding): if pseudomatch: # scan for tokens start, end = pseudomatch.span(1) spos, epos, pos = (lnum, start), (lnum, end), end + if start == end: + continue token, initial = line[start:end], line[start] if (initial in numchars or # ordinary number |