summaryrefslogtreecommitdiff
path: root/coverage/control.py
diff options
context:
space:
mode:
authorBuck Golemon <buck@yelp.com>2014-11-15 14:01:06 -0800
committerBuck Golemon <buck@yelp.com>2014-11-15 14:01:06 -0800
commitb3ccb75241566c1e1a814ae99a84637fd0ac2b44 (patch)
treed51cacbeb2935ab78db4238fc301059e41f54e8f /coverage/control.py
parent5082e667fbc65db03d32138fcdfa087a6fc073a6 (diff)
downloadpython-coveragepy-git-b3ccb75241566c1e1a814ae99a84637fd0ac2b44.tar.gz
add necessary tests, fix attrname, once it was shown to fail
--HG-- branch : __main__-support
Diffstat (limited to 'coverage/control.py')
-rw-r--r--coverage/control.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/coverage/control.py b/coverage/control.py
index 6a136da4..e568f643 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -322,13 +322,17 @@ class Coverage(object):
loader = module_namespace.get('__loader__', None)
for attrname in ('fullname', 'name'): # attribute renamed in py3.2
+ if hasattr(loader, attrname):
+ fullname = getattr(loader, attrname)
+ else:
+ continue
+
if (
- hasattr(loader, 'fullname') and
- isinstance(loader.fullname, str) and
- loader.fullname != '__main__'
+ isinstance(fullname, str) and
+ fullname != '__main__'
):
# module loaded via runpy -m
- return loader.fullname
+ return fullname
# script as first argument to python cli
inspectedname = inspect.getmodulename(filename)