summaryrefslogtreecommitdiff
path: root/coverage/files.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2009-12-03 08:54:27 -0500
committerNed Batchelder <ned@nedbatchelder.com>2009-12-03 08:54:27 -0500
commit3b6e8394c3e50cb733caafb275d2ae85c0397565 (patch)
treedd960443f9ef3772020d74c102d785968bb44dce /coverage/files.py
parent3416380e8e46d839c3111d9f82a5f7d93a218821 (diff)
parent9e4908f37c370250ebc7836e744a59170720a9e3 (diff)
downloadpython-coveragepy-git-3b6e8394c3e50cb733caafb275d2ae85c0397565.tar.gz
Merged default onto config.
--HG-- branch : config
Diffstat (limited to 'coverage/files.py')
-rw-r--r--coverage/files.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/coverage/files.py b/coverage/files.py
index 400646ca..ba228c23 100644
--- a/coverage/files.py
+++ b/coverage/files.py
@@ -18,18 +18,18 @@ class FileLocator(object):
def relative_filename(self, filename):
"""Return the relative form of `filename`.
-
+
The filename will be relative to the current directory when the
FileLocator was constructed.
-
+
"""
return filename.replace(self.relative_dir, "")
def canonical_filename(self, filename):
"""Return a canonical filename for `filename`.
-
+
An absolute path with no redundant components and normalized case.
-
+
"""
if filename not in self.canonical_filename_cache:
f = filename
@@ -48,11 +48,11 @@ class FileLocator(object):
def get_zip_data(self, filename):
"""Get data from `filename` if it is a zip file path.
-
+
Returns the string data read from the zip file, or None if no zip file
could be found or `filename` isn't in it. The data returned will be
an empty string if the file is empty.
-
+
"""
import zipimport
markers = ['.zip'+os.sep, '.egg'+os.sep]