From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 19 Feb 2019 12:16:36 +0000 (-0800)
Subject: Fix syntax warnings in tests introduced in bpo-35942. (GH-11934)
X-Git-Tag: v3.7.3rc1~67
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8834905df853510f38d4e2d628bed8229fd7482;p=thirdparty%2FPython%2Fcpython.git

Fix syntax warnings in tests introduced in bpo-35942. (GH-11934)

(cherry picked from commit 8d01eb49fc7ff914feeb2e2090d1d6ef15c932ab)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
---

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 06144713633b..bb31e053bae1 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -3311,20 +3311,12 @@ class PathTConverterTests(unittest.TestCase):
                         fn(fd, *extra_args)
 
     def test_path_t_converter_and_custom_class(self):
-        with self.assertRaisesRegex(
-                TypeError,
-                '__fspath__\(\) to return str or bytes, not int'
-            ):
+        msg = r'__fspath__\(\) to return str or bytes, not %s'
+        with self.assertRaisesRegex(TypeError, msg % r'int'):
             os.stat(FakePath(2))
-        with self.assertRaisesRegex(
-                TypeError,
-                '__fspath__\(\) to return str or bytes, not float'
-            ):
+        with self.assertRaisesRegex(TypeError, msg % r'float'):
             os.stat(FakePath(2.34))
-        with self.assertRaisesRegex(
-                TypeError,
-                '__fspath__\(\) to return str or bytes, not object'
-            ):
+        with self.assertRaisesRegex(TypeError, msg % r'object'):
             os.stat(FakePath(object()))