Mercurial Repositories > eric / file diff

--- a/eric7/DebugClients/Python/coverage/control.py	Fri Aug 20 19:56:17 2021 +0200
+++ b/eric7/DebugClients/Python/coverage/control.py	Sat Aug 21 14:21:44 2021 +0200
@@ -659,7 +659,7 @@
         data = self.get_data()
         data.write()
 
-    def combine(self, data_paths=None, strict=False):
+    def combine(self, data_paths=None, strict=False, keep=False):
         """Combine together a number of similarly-named coverage data files.
 
         All coverage data files whose name starts with `data_file` (from the
@@ -674,12 +674,16 @@
         If `strict` is true, then it is an error to attempt to combine when
         there are no data files to combine.
 
+        If `keep` is true, then original input data files won't be deleted.
+
         .. versionadded:: 4.0
             The `data_paths` parameter.
 
         .. versionadded:: 4.3
             The `strict` parameter.
 
+        .. versionadded: 5.5
+            The `keep` parameter.
         """
         self._init()
         self._init_data(suffix=None)
@@ -694,7 +698,13 @@
                 for pattern in paths[1:]:
                     aliases.add(pattern, result)
 
-        combine_parallel_data(self._data, aliases=aliases, data_paths=data_paths, strict=strict)
+        combine_parallel_data(
+            self._data,
+            aliases=aliases,
+            data_paths=data_paths,
+            strict=strict,
+            keep=keep,
+        )
 
     def get_data(self):
         """Get the collected data.
@@ -955,8 +965,8 @@
         with override_config(self,
             ignore_errors=ignore_errors, report_omit=omit, report_include=include,
             html_dir=directory, extra_css=extra_css, html_title=title,
-            skip_covered=skip_covered, show_contexts=show_contexts, report_contexts=contexts,
-            skip_empty=skip_empty, precision=precision,
+            html_skip_covered=skip_covered, show_contexts=show_contexts, report_contexts=contexts,
+            html_skip_empty=skip_empty, precision=precision,
         ):
             reporter = HtmlReporter(self)
             return reporter.report(morfs)