summaryrefslogtreecommitdiff
path: root/coverage/control.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2012-11-23 17:28:28 -0500
committerNed Batchelder <ned@nedbatchelder.com>2012-11-23 17:28:28 -0500
commitd30dbd3db7957ac22bf53fb34d4cb833b1ec4382 (patch)
tree1e8e782f471629cf7ffb7778e17256dba640aaad /coverage/control.py
parentd280a21a643b7898aaa666d0109d1d13eaeb6106 (diff)
parent8216f6839fe4f07b5e05f55ffcb34b8d8c684c93 (diff)
downloadpython-coveragepy-git-d30dbd3db7957ac22bf53fb34d4cb833b1ec4382.tar.gz
Merged Geoff's change
Diffstat (limited to 'coverage/control.py')
-rw-r--r--coverage/control.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/coverage/control.py b/coverage/control.py
index cee06ca5..28d084bf 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -189,6 +189,8 @@ class coverage(object):
if not filename.endswith(".py"):
if filename[-4:-1] == ".py":
filename = filename[:-1]
+ elif filename.endswith("$py.class"): # jython
+ filename = filename[:-9] + ".py"
return filename
def _should_trace(self, filename, frame):
@@ -289,7 +291,7 @@ class coverage(object):
pkg_file = None
else:
d, f = os.path.split(pkg_file)
- if f.startswith('__init__.'):
+ if f.startswith('__init__'):
# This is actually a package, return the directory.
pkg_file = d
else: