summaryrefslogtreecommitdiff
path: root/coverage
diff options
context:
space:
mode:
Diffstat (limited to 'coverage')
-rw-r--r--coverage/cmdline.py2
-rw-r--r--coverage/data.py2
-rw-r--r--coverage/sqldata.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index f2c36745..e4ad3859 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -667,7 +667,7 @@ class CoverageScript(object):
self.coverage.load()
data = self.coverage.get_data()
print(info_header("data"))
- print("path: %s" % self.coverage.get_data().filename())
+ print("path: %s" % self.coverage.get_data().data_filename())
if data:
print("has_arcs: %r" % data.has_arcs())
summary = line_counts(data, fullpath=True)
diff --git a/coverage/data.py b/coverage/data.py
index f78628a5..59bb073b 100644
--- a/coverage/data.py
+++ b/coverage/data.py
@@ -729,7 +729,7 @@ def combine_parallel_data(data, aliases=None, data_paths=None, strict=False):
files_combined = 0
for f in files_to_combine:
- if f == data.filename():
+ if f == data.data_filename():
# Sometimes we are combining into a file which is one of the
# parallel files. Skip that file.
if data._debug.should('dataio'):
diff --git a/coverage/sqldata.py b/coverage/sqldata.py
index 893f620d..f8961fa6 100644
--- a/coverage/sqldata.py
+++ b/coverage/sqldata.py
@@ -225,7 +225,7 @@ class CoverageSqliteData(SimpleReprMixin):
"""The base filename for storing data."""
return self._basename
- def filename(self):
+ def data_filename(self):
"""Where is the data stored?"""
return self._filename