diff options
| author | Guido van Rossum <guido@python.org> | 1997-11-18 19:23:07 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1997-11-18 19:23:07 (GMT) |
| commit | 3931df92506c60a8060c78709f05ee1afad2e788 (patch) | |
| tree | 7ab55e139fb87672cd6098ac026e3c48a784ac97 | |
| parent | 33635f818a7a801c3e95dfc213cdf8522511b813 (diff) | |
| download | cpython-3931df92506c60a8060c78709f05ee1afad2e788.zip cpython-3931df92506c60a8060c78709f05ee1afad2e788.tar.gz cpython-3931df92506c60a8060c78709f05ee1afad2e788.tar.bz2 | |
Undo another glitch of the automatic not-so-Grand Renaming; some local
variables called 'coerce' were accidentally renamed to
'PyNumber_Coerce'. Rename them back to coercefunc.
| -rw-r--r-- | Objects/classobject.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Objects/classobject.c b/Objects/classobject.c index 1e8be01..b67265b 100644 --- a/Objects/classobject.c +++ b/Objects/classobject.c @@ -1053,7 +1053,7 @@ halfbinop(v, w, opname, r_result, thisfunc, swapped) { PyObject *func; PyObject *args; - PyObject *PyNumber_Coerce; + PyObject *coercefunc; PyObject *coerced = NULL; PyObject *v1; @@ -1064,8 +1064,8 @@ halfbinop(v, w, opname, r_result, thisfunc, swapped) if (coerce_obj == NULL) return -1; } - PyNumber_Coerce = PyObject_GetAttr(v, coerce_obj); - if (PyNumber_Coerce == NULL) { + coercefunc = PyObject_GetAttr(v, coerce_obj); + if (coercefunc == NULL) { PyErr_Clear(); } else { @@ -1073,9 +1073,9 @@ halfbinop(v, w, opname, r_result, thisfunc, swapped) if (args == NULL) { return -1; } - coerced = PyEval_CallObject(PyNumber_Coerce, args); + coerced = PyEval_CallObject(coercefunc, args); Py_DECREF(args); - Py_DECREF(PyNumber_Coerce); + Py_DECREF(coercefunc); if (coerced == NULL) { return -1; } @@ -1132,7 +1132,7 @@ instance_coerce(pv, pw) { PyObject *v = *pv; PyObject *w = *pw; - PyObject *PyNumber_Coerce; + PyObject *coercefunc; PyObject *args; PyObject *coerced; @@ -1141,8 +1141,8 @@ instance_coerce(pv, pw) if (coerce_obj == NULL) return -1; } - PyNumber_Coerce = PyObject_GetAttr(v, coerce_obj); - if (PyNumber_Coerce == NULL) { + coercefunc = PyObject_GetAttr(v, coerce_obj); + if (coercefunc == NULL) { /* No __coerce__ method: always OK */ PyErr_Clear(); Py_INCREF(v); @@ -1154,9 +1154,9 @@ instance_coerce(pv, pw) if (args == NULL) { return -1; } - coerced = PyEval_CallObject(PyNumber_Coerce, args); + coerced = PyEval_CallObject(coercefunc, args); Py_DECREF(args); - Py_DECREF(PyNumber_Coerce); + Py_DECREF(coercefunc); if (coerced == NULL) { /* __coerce__ call raised an exception */ return -1; |