Skip to content

Commit 7c61ee1

Browse files
author
Eddy Xu
committed
add warning for mro inhereitance class issues
1 parent 88c1bf9 commit 7c61ee1

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

Lib/test/test_py3kwarn.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ class D(B, C):
474474
self.assertEqual(D().do_this(), "A")
475475
self.assertMROWarning(
476476
w,
477-
"classic multiple inheritance for class 'D' may resolve "
477+
"classic multiple inheritance for class 'D' will resolve "
478478
"attribute 'do_this' from 'A' in 2.x but from 'C' in 3.x "
479479
"due to C3 MRO")
480480

@@ -571,7 +571,7 @@ class D(B):
571571
self.assertEqual(D().do_this(), "A")
572572
self.assertMROWarning(
573573
w,
574-
"classic multiple inheritance for class 'D' may resolve "
574+
"classic multiple inheritance for class 'D' will resolve "
575575
"attribute 'do_this' from 'A' in 2.x but from 'C' in 3.x "
576576
"due to C3 MRO")
577577

Objects/classobject.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ warn_mro_resolution_change(PyClassObject *klass,
353353
}
354354

355355
msg = PyString_FromFormat(
356-
"classic multiple inheritance for class '%s' may resolve attribute '%s' "
356+
"classic multiple inheritance for class '%s' will resolve attribute '%s' "
357357
"from '%s' in 2.x but from '%s' in 3.x due to C3 MRO",
358358
class_name_cstr(klass),
359359
PyString_AsString(name),

0 commit comments

Comments
 (0)