Rename base_subclass to subclass_base

Ivan Levkivskyi · ilevkivskyi · commit a8437fa175c4 · 2017-11-11T10:01:20.000+01:00
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
@@ -61,7 +61,7 @@ update_bases(PyObject* bases, PyObject** args, int nargs, int* modified_bases)
         if (PyType_Check(base)) {
             continue;
         }
-        new_base_meth = PyObject_GetAttrString(base, "__base_subclass__");
+        new_base_meth = PyObject_GetAttrString(base, "__subclass_base__");
         if (!new_base_meth) {
             if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
                 PyErr_Clear();
@@ -71,7 +71,7 @@ update_bases(PyObject* bases, PyObject** args, int nargs, int* modified_bases)
         }
         if (!PyCallable_Check(new_base_meth)) {
             PyErr_SetString(PyExc_TypeError,
-                            "__base_subclass__ must be callable");
+                            "__subclass_base__ must be callable");
             return NULL;
         }
         new_base = _PyObject_FastCall(new_base_meth, stack, 1);

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ update_bases(PyObject* bases, PyObject** args, int nargs, int* modified_bases)`
`61`	`61`	`if (PyType_Check(base)) {`
`62`	`62`	`continue;`
`63`	`63`	`}`
`64`		`- new_base_meth = PyObject_GetAttrString(base, "__base_subclass__");`
	`64`	`+ new_base_meth = PyObject_GetAttrString(base, "__subclass_base__");`
`65`	`65`	`if (!new_base_meth) {`
`66`	`66`	`if (PyErr_ExceptionMatches(PyExc_AttributeError)) {`
`67`	`67`	`PyErr_Clear();`
`@@ -71,7 +71,7 @@ update_bases(PyObject* bases, PyObject** args, int nargs, int* modified_bases)`
`71`	`71`	`}`
`72`	`72`	`if (!PyCallable_Check(new_base_meth)) {`
`73`	`73`	`PyErr_SetString(PyExc_TypeError,`
`74`		`- "__base_subclass__ must be callable");`
	`74`	`+ "__subclass_base__ must be callable");`
`75`	`75`	`return NULL;`
`76`	`76`	`}`
`77`	`77`	`new_base = _PyObject_FastCall(new_base_meth, stack, 1);`