summaryrefslogtreecommitdiff
path: root/coverage/files.py
diff options
context:
space:
mode:
Diffstat (limited to 'coverage/files.py')
-rw-r--r--coverage/files.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/coverage/files.py b/coverage/files.py
index fb59732..28331a1 100644
--- a/coverage/files.py
+++ b/coverage/files.py
@@ -24,7 +24,8 @@ class FileLocator(object):
"""
common_prefix = os.path.commonprefix(
- [filename, self.relative_dir + os.sep])
+ [filename, self.relative_dir + os.sep]
+ )
return filename[len(common_prefix):]
def canonical_filename(self, filename):
@@ -40,6 +41,8 @@ class FileLocator(object):
f = os.path.basename(f)
if not os.path.isabs(f):
for path in [os.curdir] + sys.path:
+ if path is None:
+ continue
g = os.path.join(path, f)
if os.path.exists(g):
f = g
@@ -69,7 +72,7 @@ class FileLocator(object):
data = zi.get_data(parts[1])
except IOError:
continue
- if sys.hexversion > 0x03000000:
+ if sys.version_info >= (3, 0):
data = data.decode('utf8') # TODO: How to do this properly?
return data
return None