summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-10-15 03:05:39 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-10-15 03:05:39 (GMT)
commitca2d2529cee492ea0ac2b88ba0fdeb75fff0781a (patch)
tree8f99bf4331166f28348cd5d6e290ca70a784471b /Lib
parente52657220c496dba6a7f84715e08f0c6a81d91dd (diff)
downloadcpython-ca2d2529cee492ea0ac2b88ba0fdeb75fff0781a.zip
cpython-ca2d2529cee492ea0ac2b88ba0fdeb75fff0781a.tar.gz
cpython-ca2d2529cee492ea0ac2b88ba0fdeb75fff0781a.tar.bz2
some cleanups
Diffstat (limited to 'Lib')
-rw-r--r--Lib/tokenize.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/Lib/tokenize.py b/Lib/tokenize.py
index 686ad66..ae3de54 100644
--- a/Lib/tokenize.py
+++ b/Lib/tokenize.py
@@ -23,15 +23,15 @@ function to which the 5 fields described above are passed as 5 arguments,
each time a new token is found."""
__author__ = 'Ka-Ping Yee <ping@lfw.org>'
-__credits__ = \
- 'GvR, ESR, Tim Peters, Thomas Wouters, Fred Drake, Skip Montanaro, Raymond Hettinger'
+__credits__ = ('GvR, ESR, Tim Peters, Thomas Wouters, Fred Drake, '
+ 'Skip Montanaro, Raymond Hettinger')
import string, re
from token import *
import token
-__all__ = [x for x in dir(token) if x[0] != '_'] + ["COMMENT", "tokenize",
- "generate_tokens", "NL", "untokenize"]
+__all__ = [x for x in dir(token) if not x.startswith("_")]
+__all__ += ["COMMENT", "tokenize", "generate_tokens", "NL", "untokenize"]
del x
del token
@@ -288,7 +288,7 @@ def generate_tokens(readline):
line = readline()
except StopIteration:
line = ''
- lnum = lnum + 1
+ lnum += 1
pos, max = 0, len(line)
if contstr: # continued string
@@ -317,14 +317,14 @@ def generate_tokens(readline):
column = 0
while pos < max: # measure leading whitespace
if line[pos] == ' ':
- column = column + 1
+ column += 1
elif line[pos] == '\t':
column = (column//tabsize + 1)*tabsize
elif line[pos] == '\f':
column = 0
else:
break
- pos = pos + 1
+ pos += 1
if pos == max:
break
@@ -403,14 +403,14 @@ def generate_tokens(readline):
continued = 1
else:
if initial in '([{':
- parenlev = parenlev + 1
+ parenlev += 1
elif initial in ')]}':
- parenlev = parenlev - 1
+ parenlev -= 1
yield (OP, token, spos, epos, line)
else:
yield (ERRORTOKEN, line[pos],
(lnum, pos), (lnum, pos+1), line)
- pos = pos + 1
+ pos += 1
for indent in indents[1:]: # pop remaining indent levels
yield (DEDENT, '', (lnum, 0), (lnum, 0), '')