]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-107910: Remove not needing newline in error message (GH-107928)
authorJoon Hwan 김준환 <xncbf12@gmail.com>
Mon, 14 Aug 2023 09:26:18 +0000 (18:26 +0900)
committerGitHub <noreply@github.com>
Mon, 14 Aug 2023 09:26:18 +0000 (12:26 +0300)
Lib/test/test_descr.py
Objects/typeobject.c

index ad3eefba365856504439fce03ec03a66fe9d1bed..fc8d0a305d8da08c89d1081da530a25062ffe632 100644 (file)
@@ -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:
index 030e8bfc99b6d756c22776d8eb4e9b0952cacbfa..7ce3de4d58d0d3ceb6931b6774239565e7fd3a6a 100644 (file)
@@ -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);