[Python-checkins] [3.6] bpo-31572: Get rid of using _PyObject_HasAttrId() in pickle. (GH-3729). (#4081)
Serhiy Storchaka
webhook-mailer at python.org
Mon Oct 23 08:00:46 EDT 2017
https://github.com/python/cpython/commit/77af0a3bcab666a356eea2927a8031a7578d60d2
commit: 77af0a3bcab666a356eea2927a8031a7578d60d2
branch: 3.6
author: Serhiy Storchaka <storchaka at gmail.com>
committer: GitHub <noreply at github.com>
date: 2017-10-23T15:00:41+03:00
summary:
[3.6] bpo-31572: Get rid of using _PyObject_HasAttrId() in pickle. (GH-3729). (#4081)
(cherry picked from commit 04e36af9b88cd5e80fc818e51d46f07252a2ff3f)
files:
M Modules/_pickle.c
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index ef0a03b1079..bc1af548072 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -4198,19 +4198,23 @@ _pickle_Pickler___init___impl(PicklerObject *self, PyObject *file,
self->fast = 0;
self->fast_nesting = 0;
self->fast_memo = NULL;
- self->pers_func = NULL;
- if (_PyObject_HasAttrId((PyObject *)self, &PyId_persistent_id)) {
- self->pers_func = _PyObject_GetAttrId((PyObject *)self,
- &PyId_persistent_id);
- if (self->pers_func == NULL)
+
+ self->pers_func = _PyObject_GetAttrId((PyObject *)self,
+ &PyId_persistent_id);
+ if (self->pers_func == NULL) {
+ if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
return -1;
+ }
+ PyErr_Clear();
}
- self->dispatch_table = NULL;
- if (_PyObject_HasAttrId((PyObject *)self, &PyId_dispatch_table)) {
- self->dispatch_table = _PyObject_GetAttrId((PyObject *)self,
- &PyId_dispatch_table);
- if (self->dispatch_table == NULL)
+
+ self->dispatch_table = _PyObject_GetAttrId((PyObject *)self,
+ &PyId_dispatch_table);
+ if (self->dispatch_table == NULL) {
+ if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
return -1;
+ }
+ PyErr_Clear();
}
return 0;
@@ -5165,22 +5169,24 @@ load_frozenset(UnpicklerObject *self)
static PyObject *
instantiate(PyObject *cls, PyObject *args)
{
- PyObject *result = NULL;
- _Py_IDENTIFIER(__getinitargs__);
/* Caller must assure args are a tuple. Normally, args come from
Pdata_poptuple which packs objects from the top of the stack
into a newly created tuple. */
assert(PyTuple_Check(args));
- if (Py_SIZE(args) > 0 || !PyType_Check(cls) ||
- _PyObject_HasAttrId(cls, &PyId___getinitargs__)) {
- result = PyObject_CallObject(cls, args);
- }
- else {
+ if (!PyTuple_GET_SIZE(args) && PyType_Check(cls)) {
+ _Py_IDENTIFIER(__getinitargs__);
_Py_IDENTIFIER(__new__);
-
- result = _PyObject_CallMethodId(cls, &PyId___new__, "O", cls);
+ PyObject *func = _PyObject_GetAttrId(cls, &PyId___getinitargs__);
+ if (func == NULL) {
+ if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
+ return NULL;
+ }
+ PyErr_Clear();
+ return _PyObject_CallMethodIdObjArgs(cls, &PyId___new__, cls, NULL);
+ }
+ Py_DECREF(func);
}
- return result;
+ return PyObject_CallObject(cls, args);
}
static int
@@ -6626,17 +6632,14 @@ _pickle_Unpickler___init___impl(UnpicklerObject *self, PyObject *file,
return -1;
self->fix_imports = fix_imports;
- if (self->fix_imports == -1)
- return -1;
- if (_PyObject_HasAttrId((PyObject *)self, &PyId_persistent_load)) {
- self->pers_func = _PyObject_GetAttrId((PyObject *)self,
- &PyId_persistent_load);
- if (self->pers_func == NULL)
- return 1;
- }
- else {
- self->pers_func = NULL;
+ self->pers_func = _PyObject_GetAttrId((PyObject *)self,
+ &PyId_persistent_load);
+ if (self->pers_func == NULL) {
+ if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
+ return -1;
+ }
+ PyErr_Clear();
}
self->stack = (Pdata *)Pdata_New();
More information about the Python-checkins
mailing list