Skip to content

Commit c3887b5

Browse files
authored
gh-107910: Remove not needing newline in error message (GH-107928)
1 parent cc2cf85 commit c3887b5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Lib/test/test_descr.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -989,8 +989,8 @@ class EditableScrollablePane(ScrollablePane,EditablePane): pass
989989

990990
def test_mro_disagreement(self):
991991
# Testing error messages for MRO disagreement...
992-
mro_err_msg = """Cannot create a consistent method resolution
993-
order (MRO) for bases """
992+
mro_err_msg = ("Cannot create a consistent method resolution "
993+
"order (MRO) for bases ")
994994

995995
def raises(exc, expected, callable, *args):
996996
try:

Objects/typeobject.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2444,7 +2444,7 @@ set_mro_error(PyObject **to_merge, Py_ssize_t to_merge_size, int *remain)
24442444
n = PyDict_GET_SIZE(set);
24452445

24462446
off = PyOS_snprintf(buf, sizeof(buf), "Cannot create a \
2447-
consistent method resolution\norder (MRO) for bases");
2447+
consistent method resolution order (MRO) for bases");
24482448
i = 0;
24492449
while (PyDict_Next(set, &i, &k, &v) && (size_t)off < sizeof(buf)) {
24502450
PyObject *name = class_name(k);

0 commit comments

Comments
 (0)