diff options
author | Ned Batchelder <ned@nedbatchelder.com> | 2019-04-20 23:17:30 -0400 |
---|---|---|
committer | Ned Batchelder <ned@nedbatchelder.com> | 2019-04-20 23:17:30 -0400 |
commit | 0bdb413621460807583ab0baedf1d615a7a62da6 (patch) | |
tree | 09df82befe921987556c0f22998b9833cbc8ce25 /coverage/data.py | |
parent | c35c5803f2ea69f67818771179882d17d3e4bf2f (diff) | |
download | python-coveragepy-git-0bdb413621460807583ab0baedf1d615a7a62da6.tar.gz |
Don't name new method the same as old attribute
Diffstat (limited to 'coverage/data.py')
-rw-r--r-- | coverage/data.py | 2 |
1 files changed, 1 insertions, 1 deletions
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'): |