mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-01 04:42:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

merge

Browse source
This commit is contained in:
Christian Heimes 2013-11-14 01:48:32 +01:00
commit c6ae813011
3 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Modules/_pickle.c
View file

@ -136,6 +136,7 @@ static PyObject *empty_tuple = NULL;
/* For looking up name pairs in copyreg._extension_registry. */ /* For looking up name pairs in copyreg._extension_registry. */
static PyObject *two_tuple = NULL; static PyObject *two_tuple = NULL;
_Py_IDENTIFIER(__name__);
_Py_IDENTIFIER(modules); _Py_IDENTIFIER(modules);
static int static int
@ -2599,7 +2600,6 @@ save_dict(PicklerObject *self, PyObject *obj)
static int static int
save_global(PicklerObject *self, PyObject *obj, PyObject *name) save_global(PicklerObject *self, PyObject *obj, PyObject *name)
{ {
static PyObject *name_str = NULL;
PyObject *global_name = NULL; PyObject *global_name = NULL;
PyObject *module_name = NULL; PyObject *module_name = NULL;
PyObject *module = NULL; PyObject *module = NULL;
@ -2608,18 +2608,12 @@ save_global(PicklerObject *self, PyObject *obj, PyObject *name)
const char global_op = GLOBAL; const char global_op = GLOBAL;
if (name_str == NULL) {
name_str = PyUnicode_InternFromString("__name__");
if (name_str == NULL)
goto error;
}
if (name) { if (name) {
global_name = name; global_name = name;
Py_INCREF(global_name); Py_INCREF(global_name);
} }
else { else {
global_name = PyObject_GetAttr(obj, name_str); global_name = _PyObject_GetAttrId(obj, &PyId___name__);
if (global_name == NULL) if (global_name == NULL)
goto error; goto error;
} }
@ -3016,17 +3010,16 @@ save_reduce(PicklerObject *self, PyObject *args, PyObject *obj)
/* Protocol 2 special case: if callable's name is __newobj__, use /* Protocol 2 special case: if callable's name is __newobj__, use
NEWOBJ. */ NEWOBJ. */
if (use_newobj) { if (use_newobj) {
static PyObject *newobj_str = NULL, *name_str = NULL; static PyObject *newobj_str = NULL;
PyObject *name; PyObject *name;
if (newobj_str == NULL) { if (newobj_str == NULL) {
newobj_str = PyUnicode_InternFromString("__newobj__"); newobj_str = PyUnicode_InternFromString("__newobj__");
name_str = PyUnicode_InternFromString("__name__"); if (newobj_str == NULL)
if (newobj_str == NULL || name_str == NULL)
return -1; return -1;
} }
name = PyObject_GetAttr(callable, name_str); name = _PyObject_GetAttrId(callable, &PyId___name__);
if (name == NULL) { if (name == NULL) {
if (PyErr_ExceptionMatches(PyExc_AttributeError)) if (PyErr_ExceptionMatches(PyExc_AttributeError))
PyErr_Clear(); PyErr_Clear();

18
Modules/arraymodule.c
View file

@ -1133,13 +1133,25 @@ Insert a new item x into the array before position i.");
static PyObject * static PyObject *
array_buffer_info(arrayobject *self, PyObject *unused) array_buffer_info(arrayobject *self, PyObject *unused)
{ {
PyObject* retval = NULL; PyObject *retval = NULL, *v;
retval = PyTuple_New(2); retval = PyTuple_New(2);
if (!retval) if (!retval)
return NULL; return NULL;
PyTuple_SET_ITEM(retval, 0, PyLong_FromVoidPtr(self->ob_item)); v = PyLong_FromVoidPtr(self->ob_item);
PyTuple_SET_ITEM(retval, 1, PyLong_FromLong((long)(Py_SIZE(self)))); if (v == NULL) {
Py_DECREF(retval);
return NULL;
}
PyTuple_SET_ITEM(retval, 0, v);
v = PyLong_FromLong((long)(Py_SIZE(self)));
if (v == NULL) {
Py_DECREF(retval);
return NULL;
}
PyTuple_SET_ITEM(retval, 1, v);
return retval; return retval;
} }

1
Python/peephole.c
View file

@ -275,6 +275,7 @@ fold_unaryops_on_constants(unsigned char *codestr, PyObject *consts, PyObject *v
len_consts = PyList_GET_SIZE(consts); len_consts = PyList_GET_SIZE(consts);
if (PyList_Append(consts, newconst)) { if (PyList_Append(consts, newconst)) {
Py_DECREF(newconst); Py_DECREF(newconst);
PyErr_Clear();
return 0; return 0;
} }
Py_DECREF(newconst); Py_DECREF(newconst);