Undo recent change that banned using import to bind a global, as per
discussion on python-dev. 'from mod import *' is still banned except
at the module level.
Fix value for special NOOPT entry in symtable. Initialze to 0 instead
of None, so that later uses of PyInt_AS_LONG() are valid. (Bug
reported by Donn Cave.)
replace local REPR macros with PyObject_REPR in object.h
diff --git a/Python/ceval.c b/Python/ceval.c
index 15e0b3a..8eaa8bd 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -31,8 +31,6 @@
typedef PyObject *(*callproc)(PyObject *, PyObject *, PyObject *);
-#define REPR(ob) PyString_AS_STRING(PyObject_Repr(ob))
-
/* Forward declarations */
static PyObject *eval_code2(PyCodeObject *,
@@ -1456,7 +1454,7 @@
if ((x = f->f_locals) == NULL) {
PyErr_Format(PyExc_SystemError,
"no locals found when storing %s",
- REPR(w));
+ PyObject_REPR(w));
break;
}
err = PyDict_SetItem(x, w, v);
@@ -1468,7 +1466,7 @@
if ((x = f->f_locals) == NULL) {
PyErr_Format(PyExc_SystemError,
"no locals when deleting %s",
- REPR(w));
+ PyObject_REPR(w));
break;
}
if ((err = PyDict_DelItem(x, w)) != 0)
@@ -1563,7 +1561,7 @@
if ((x = f->f_locals) == NULL) {
PyErr_Format(PyExc_SystemError,
"no locals when loading %s",
- REPR(w));
+ PyObject_REPR(w));
break;
}
x = PyDict_GetItem(x, w);
