fix: reduce the scope of a try/except.

Author: nedbat

CHANGES.rst

@@ -20,11 +20,17 @@ development at the same time, such as 4.5.x and 5.0.
 Unreleased
 ----------
 
+- Fix a messaging failure when combining Windows data files on a different
+  drive than the current directory. (`pull 1430`_, fixing `issue 1428`_).
+  Thanks, Lorenzo Micò.
+
 - Fix a problem with Cython code measurement (`pull 1347`_, fixing `issue
   972`_).  Thanks, Matus Valo.
 
-.. _pull 1347: https://github.com/nedbat/coveragepy/pull/1347
 .. _issue 972: https://github.com/nedbat/coveragepy/issues/972
+.. _pull 1347: https://github.com/nedbat/coveragepy/pull/1347
+.. _pull 1428: https://github.com/nedbat/coveragepy/issues/1428
+.. _pull 1430: https://github.com/nedbat/coveragepy/pull/1430
 
 
 .. _changes_6-4-2:

CONTRIBUTORS.txt

@@ -98,6 +98,7 @@ Lars Hupfeldt Nielsen
 Leonardo Pistone
 Lex Berezhny
 Loïc Dachary
+Lorenzo Micò
 Marc Abramowitz
 Marcelo Trylesinski
 Marcus Cobden

coverage/data.py

@@ -133,12 +133,13 @@ def combine_parallel_data(
             files_combined += 1
             if message:
                 try:
-                    message(f"Combined data file {os.path.relpath(f)}")
+                    file_name = os.path.relpath(f)
                 except ValueError:
                     # ValueError can be raised under Windows when os.getcwd() returns a
                     # folder from a different drive than the drive of f, in which case
                     # we print the original value of f instead of its relative path
-                    message(f"Combined data file {f!r}")
+                    file_name = f
+                message(f"Combined data file {file_name}")
             if not keep:
                 if data._debug.should('dataio'):
                     data._debug.write(f"Deleting combined data file {f!r}")