From 0bdb413621460807583ab0baedf1d615a7a62da6 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sat, 20 Apr 2019 23:17:30 -0400 Subject: Don't name new method the same as old attribute --- coverage/data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'coverage/data.py') 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'): -- cgit v1.2.1