summaryrefslogtreecommitdiff
path: root/coverage/phystokens.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2010-03-13 08:00:40 -0500
committerNed Batchelder <ned@nedbatchelder.com>2010-03-13 08:00:40 -0500
commitd268eb9986f7fef9c5f9276c54e313c5313a50c5 (patch)
tree5d7e73580c4bcb9615a3d909bea2db4e6e9d2dff /coverage/phystokens.py
parent1f5057dc7d6b7d02084ee15e2d93fb43d142c630 (diff)
downloadpython-coveragepy-git-d268eb9986f7fef9c5f9276c54e313c5313a50c5.tar.gz
Deal properly with dos-ended source files while tokenizing. Fixes issue #53.
Diffstat (limited to 'coverage/phystokens.py')
-rw-r--r--coverage/phystokens.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/coverage/phystokens.py b/coverage/phystokens.py
index 5824b9b9..60b87932 100644
--- a/coverage/phystokens.py
+++ b/coverage/phystokens.py
@@ -77,7 +77,8 @@ def source_token_lines(source):
ws_tokens = [token.INDENT, token.DEDENT, token.NEWLINE, tokenize.NL]
line = []
col = 0
- tokgen = tokenize.generate_tokens(StringIO(source.expandtabs(8)).readline)
+ source = source.expandtabs(8).replace('\r\n', '\n')
+ tokgen = tokenize.generate_tokens(StringIO(source).readline)
for ttype, ttext, (_, scol), (_, ecol), _ in phys_tokens(tokgen):
mark_start = True
for part in re.split('(\n)', ttext):