diff options
| -rw-r--r-- | CHANGES.rst | 8 | ||||
| -rw-r--r-- | coverage/cmdline.py | 2 | ||||
| -rw-r--r-- | coverage/data.py | 2 | ||||
| -rw-r--r-- | coverage/sqldata.py | 2 | ||||
| -rw-r--r-- | tests/test_cmdline.py | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index 3aa7580e..cae6e2d7 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -33,10 +33,10 @@ Unreleased 761`_. Thanks, Stephan Richter. - The ``filename`` attribute on `CoverageData` object has been made private. - You can use the ``filename`` method to get the actual file name being used - to store data, and the ``base_filename`` method to get the original filename - before parallelizing suffixes were added. This is part of fixing `issue - 708`_. + You can use the ``data_filename`` method to get the actual file name being + used to store data, and the ``base_filename`` method to get the original + filename before parallelizing suffixes were added. This is part of fixing + `issue 708`_. - Line numbers in the HTML report now align properly with source lines, even when Chrome's minimum font size is set, fixing `issue 748`_. Thanks Wen Ye. 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 diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py index 2a7fba57..a3a5b2b5 100644 --- a/tests/test_cmdline.py +++ b/tests/test_cmdline.py @@ -691,7 +691,7 @@ class CmdLineWithFilesTest(BaseCmdLineTest): 2 files: file1.py: 17 lines [a_plugin] file2.py: 23 lines - """).replace("FILENAME", data.filename())) + """).replace("FILENAME", data.data_filename())) def test_debug_data_with_no_data(self): data = CoverageData() @@ -700,7 +700,7 @@ class CmdLineWithFilesTest(BaseCmdLineTest): -- data ------------------------------------------------------ path: FILENAME No data collected - """).replace("FILENAME", data.filename())) + """).replace("FILENAME", data.data_filename())) class CmdLineStdoutTest(BaseCmdLineTest): |