diff options
| author | Thomas Wouters <thomas@python.org> | 2007-02-26 18:20:15 (GMT) |
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2007-02-26 18:20:15 (GMT) |
| commit | a44f3a3e0bb6f829373976475479efb260f09ed0 (patch) | |
| tree | 397e2bb3474d7c2e96c835351f2a689cedd2cada /Python/ceval.c | |
| parent | a88a0331b7664db95858ba470a505c318d1066f9 (diff) | |
| download | cpython-a44f3a3e0bb6f829373976475479efb260f09ed0.zip cpython-a44f3a3e0bb6f829373976475479efb260f09ed0.tar.gz cpython-a44f3a3e0bb6f829373976475479efb260f09ed0.tar.bz2 | |
Merged revisions 53912-53951 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53919 | thomas.wouters | 2007-02-25 23:12:31 +0100 (Sun, 25 Feb 2007) | 8 lines
Backported r51621 from p3yk:
Don't use a fixed temporary name (gdbm).
Don't use our own temp name creation (dbm).
Should be backported to 2.5.
........
r53935 | georg.brandl | 2007-02-26 14:51:29 +0100 (Mon, 26 Feb 2007) | 2 lines
Backport from Py3k branch: fix refleak in PyString_Format.
........
r53943 | jeremy.hylton | 2007-02-26 17:14:51 +0100 (Mon, 26 Feb 2007) | 2 lines
Reformat long lines.
........
r53947 | neal.norwitz | 2007-02-26 18:01:08 +0100 (Mon, 26 Feb 2007) | 1 line
Add Steven Bethard to help out with patches.
........
r53949 | georg.brandl | 2007-02-26 18:09:03 +0100 (Mon, 26 Feb 2007) | 3 lines
Fix typo.
........
r53951 | neal.norwitz | 2007-02-26 19:10:47 +0100 (Mon, 26 Feb 2007) | 5 lines
Fix a couple of problems in generating the AST code:
* use %r instead of backticks since backticks are going away in Py3k
* PyArena_Malloc() already sets PyErr_NoMemory so we don't need to do it again
* the signature for ast2obj_int incorrectly used a bool, rather than a long
........
Diffstat (limited to 'Python/ceval.c')
| -rw-r--r-- | Python/ceval.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index b119e15..5f1b873 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -4077,7 +4077,8 @@ build_class(PyObject *methods, PyObject *bases, PyObject *name) metaclass = (PyObject *) &PyType_Type; Py_INCREF(metaclass); } - result = PyObject_CallFunctionObjArgs(metaclass, name, bases, methods, NULL); + result = PyObject_CallFunctionObjArgs(metaclass, name, bases, methods, + NULL); Py_DECREF(metaclass); if (result == NULL && PyErr_ExceptionMatches(PyExc_TypeError)) { /* A type error here likely means that the user passed @@ -4091,7 +4092,8 @@ build_class(PyObject *methods, PyObject *bases, PyObject *name) if (PyString_Check(pvalue)) { PyObject *newmsg; newmsg = PyString_FromFormat( - "Error when calling the metaclass bases\n %s", + "Error when calling the metaclass bases\n" + " %s", PyString_AS_STRING(pvalue)); if (newmsg != NULL) { Py_DECREF(pvalue); |