summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/test/test_descr.py4
-rw-r--r--Objects/typeobject.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index ad3eefb..fc8d0a3 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 030e8bf..7ce3de4 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);