diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2011-05-31 09:35:29 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2011-05-31 09:35:29 -0400 |
| commit | 61deec574e9d0181ad986d1276e3d57e8427930d (patch) | |
| tree | 5e25c531b0a8464be275704a9c6f2f2393456406 | |
| parent | 8389eddf44b9084d0173bcce79d640250d72a455 (diff) | |
| parent | adde2749360d445328405b9a5197960df181b3ad (diff) | |
| download | python-coveragepy-git-61deec574e9d0181ad986d1276e3d57e8427930d.tar.gz | |
Automated merge with ssh://bitbucket.org/ned/coveragepy
| -rw-r--r-- | CHANGES.txt | 10 | ||||
| -rw-r--r-- | coverage/results.py | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 7dfad516..17c5c353 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -32,13 +32,10 @@ Version 3.5b1 - Modules can now be run directly using ``coverage run -m modulename``, to mirror Python's ``-m`` flag. Closes `issue 95`_, thanks, Brandon Rhodes. -- ``coverage run`` didn't emulate Python accurately in one detail: the +- ``coverage run`` didn't emulate Python accurately in one small detail: the current directory inserted into ``sys.path`` was relative rather than absolute. This is now fixed. -- A little bit of Jython support: `coverage run` can now measure Jython - execution by adapting when $py.class files are traced. Thanks, Adi Roiban. - - HTML reporting is now incremental: a record is kept of the data that produced the HTML reports, and only files whose data has changed will be generated. This should make most HTML reporting faster. @@ -66,6 +63,11 @@ Version 3.5b1 the directory name to python: ``python coverage_py_working_dir run ...``. Thanks, Brett Cannon. +- A little bit of Jython support: `coverage run` can now measure Jython + execution by adapting when $py.class files are traced. Thanks, Adi Roiban. + Jython still doesn't provide the Python libraries needed to make + coverage reporting work, unfortunately. + - Internally, files are now closed explicitly, fixing `issue 104`_. Thanks, Brett Cannon. diff --git a/coverage/results.py b/coverage/results.py index d92b503c..7b032f18 100644 --- a/coverage/results.py +++ b/coverage/results.py @@ -97,8 +97,8 @@ class Analysis(object): # trouble, and here is where it's the least burden to remove them. unpredicted = [ e for e in executed - if e not in possible - and e[0] != e[1] + if e not in possible + and e[0] != e[1] and e[0] not in self.no_branch ] return sorted(unpredicted) |