commit | 4d0d471a8031de90a2b1ce99c4ac4780e60b3bc9 | [log] [tgz] |
---|---|---|
author | Martin v. Löwis <martin@v.loewis.de> | Fri Dec 03 20:14:31 2010 +0000 |
committer | Martin v. Löwis <martin@v.loewis.de> | Fri Dec 03 20:14:31 2010 +0000 |
tree | c8f1fef715f8d158e58f17cab14af65455de1d77 | |
parent | c4df7845143f9afe0d20f4421a41904f3cbb991a [diff] [blame] |
Merge branches/pep-0384.
diff --git a/Objects/funcobject.c b/Objects/funcobject.c index 221f368..45f9f57 100644 --- a/Objects/funcobject.c +++ b/Objects/funcobject.c
@@ -627,7 +627,7 @@ } result = PyEval_EvalCodeEx( - (PyCodeObject *)PyFunction_GET_CODE(func), + PyFunction_GET_CODE(func), PyFunction_GET_GLOBALS(func), (PyObject *)NULL, &PyTuple_GET_ITEM(arg, 0), PyTuple_GET_SIZE(arg), k, nk, d, nd,