summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2012-07-31 21:56:22 -0400
committerNed Batchelder <ned@nedbatchelder.com>2012-07-31 21:56:22 -0400
commitece33ca68a98a516e61a141fd8150385395abb66 (patch)
tree50b55b57dc839ac748b5bc37755669584485567e
parente4671e4ba2dd74204abd6a41ddb411f786c484cd (diff)
downloadpython-coveragepy-ece33ca68a98a516e61a141fd8150385395abb66.tar.gz
Finish the paperwork on Julian's patch.
-rw-r--r--AUTHORS.txt1
-rw-r--r--CHANGES.txt5
-rw-r--r--coverage/parser.py1
-rw-r--r--test/test_html.py1
4 files changed, 6 insertions, 2 deletions
diff --git a/AUTHORS.txt b/AUTHORS.txt
index ef8ef27..1bb1d0c 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -6,6 +6,7 @@ Other contributions have been made by:
Marc Abramowitz
Chris Adams
Geoff Bache
+Julian Berman
Titus Brown
Brett Cannon
Pablo Carballo
diff --git a/CHANGES.txt b/CHANGES.txt
index 196ea1d..4040885 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,11 +12,16 @@ Version 3.5.3b1
- Files encoded as UTF-8 with a BOM are now properly handled, fixing
`issue 179`_. Thanks, Pablo Carballo.
+- Fixed more cases of non-Python files being reported as Python source, and
+ then not being able to parse them as Python. Closes `issue 82` (again).
+ Thanks, Julian Berman.
+
- Try to do a better job of the impossible task of detecting when we can't
build the C extension, fixing `issue 183`_.
- Testing is now done with `tox`_.
+.. _issue 82: https://bitbucket.org/ned/coveragepy/issue/82/tokenerror-when-generating-html-report
.. _issue 179: https://bitbucket.org/ned/coveragepy/issue/179/htmlreporter-fails-when-source-file-is
.. _issue 183: https://bitbucket.org/ned/coveragepy/issue/183/install-fails-for-python-23
.. _tox: http://tox.readthedocs.org/
diff --git a/coverage/parser.py b/coverage/parser.py
index a9cceb3..636a835 100644
--- a/coverage/parser.py
+++ b/coverage/parser.py
@@ -203,7 +203,6 @@ class CodeParser(object):
statements.
"""
-
try:
self._raw_parse()
except tokenize.TokenError:
diff --git a/test/test_html.py b/test/test_html.py
index 96f98c8..3ebdb10 100644
--- a/test/test_html.py
+++ b/test/test_html.py
@@ -204,7 +204,6 @@ class HtmlWithUnparsableFilesTest(CoverageTest):
have been raised when writing the HTML report.
"""
-
source = "exec compile('', '', 'exec') in {'__file__' : 'liar.html'}"
self.make_file("liar.py", source)
self.make_file("liar.html", "{# Whoops, not python code #}")