From 3722f1f483065338e83ec1e28cd8dc8412ef39d7 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Wed, 8 Feb 2017 15:49:10 +0100 Subject: [PATCH] support: temp_dir() and change_cwd() uses repr() in error message Serhiy Storshaka pointed me that str(path) can emit a BytesWarning: use repr(path) instead. --- Lib/test/support/__init__.py | 4 ++-- Lib/test/test_support.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index d82ac88d77..6658ece735 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -958,7 +958,7 @@ def temp_dir(path=None, quiet=False): if not quiet: raise warnings.warn(f'tests may fail, unable to create ' - f'temporary directory {path}: {exc}', + f'temporary directory {path!r}: {exc}', RuntimeWarning, stacklevel=3) try: yield path @@ -986,7 +986,7 @@ def change_cwd(path, quiet=False): if not quiet: raise warnings.warn(f'tests may fail, unable to change the current working ' - f'directory to {path}: {exc}', + f'directory to {path!r}: {exc}', RuntimeWarning, stacklevel=3) try: yield os.getcwd() diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py index dd0c7bc232..0dbe02eeb3 100644 --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -158,7 +158,7 @@ class TestSupport(unittest.TestCase): self.assertEqual(len(warnings), 1, warnings) warn = warnings[0] self.assertTrue(warn.startswith(f'tests may fail, unable to create ' - f'temporary directory {path}: '), + f'temporary directory {path!r}: '), warn) # Tests for change_cwd() @@ -204,7 +204,7 @@ class TestSupport(unittest.TestCase): warn = warnings[0] self.assertTrue(warn.startswith(f'tests may fail, unable to change ' f'the current working directory ' - f'to {bad_dir}: '), + f'to {bad_dir!r}: '), warn) # Tests for change_cwd() @@ -221,7 +221,7 @@ class TestSupport(unittest.TestCase): msg = messages[0] self.assertTrue(msg.startswith(f'tests may fail, unable to change ' f'the current working directory ' - f'to {path}: '), + f'to {path!r}: '), msg) # Tests for temp_cwd() -- 2.40.0