From c3887b57a75a105615dd555aaf74e6c9a243ebdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joon=20Hwan=20=EA=B9=80=EC=A4=80=ED=99=98?= Date: Mon, 14 Aug 2023 18:26:18 +0900 Subject: [PATCH] gh-107910: Remove not needing newline in error message (GH-107928) --- Lib/test/test_descr.py | 4 ++-- Objects/typeobject.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index ad3eefba365..fc8d0a305d8 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -989,8 +989,8 @@ class ClassPropertiesAndMethods(unittest.TestCase): def test_mro_disagreement(self): # Testing error messages for MRO disagreement... - mro_err_msg = """Cannot create a consistent method resolution -order (MRO) for bases """ + mro_err_msg = ("Cannot create a consistent method resolution " + "order (MRO) for bases ") def raises(exc, expected, callable, *args): try: diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 030e8bfc99b..7ce3de4d58d 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -2444,7 +2444,7 @@ set_mro_error(PyObject **to_merge, Py_ssize_t to_merge_size, int *remain) n = PyDict_GET_SIZE(set); off = PyOS_snprintf(buf, sizeof(buf), "Cannot create a \ -consistent method resolution\norder (MRO) for bases"); +consistent method resolution order (MRO) for bases"); i = 0; while (PyDict_Next(set, &i, &k, &v) && (size_t)off < sizeof(buf)) { PyObject *name = class_name(k);