cpython: 3119f08802a5 (original) (raw)

Mercurial > cpython

changeset 104366:3119f08802a5 2.7

Issue #26906: Resolving special methods of uninitialized type now causes implicit initialization of the type instead of a fail. [#26906]

Serhiy Storchaka storchaka@gmail.com
date	Sat, 08 Oct 2016 12:24:09 +0300
parents	4ed5f0e9bba2
children	de13f5a0f4d5
files	Misc/NEWS Objects/typeobject.c
diffstat	2 files changed, 22 insertions(+), 5 deletions(-)[+] [-] Misc/NEWS 3 Objects/typeobject.c 24

line wrap: on

line diff

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ What's New in Python 2.7.13? Core and Builtins ----------------- +- Issue #26906: Resolving special methods of uninitialized type now causes

implicit initialization of the type instead of a fail. +

Issue #18287: PyType_Ready() now checks that tp_name is not NULL. Original patch by Niklas Koep.

--- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -2545,11 +2545,25 @@ PyObject / Look in tp_dict of types in MRO */ mro = type->tp_mro;

/* If mro is NULL, the type is either not yet initialized

  by PyType_Ready(), or already cleared by type_clear().[](#l2.8)

  Either way the safest thing to do is to return NULL. */[](#l2.9)

if (mro == NULL)
```
   return NULL;[](#l2.11)
```

if (mro == NULL) {

   if ((type->tp_flags & Py_TPFLAGS_READYING) == 0 &&[](#l2.13)

       PyType_Ready(type) < 0) {[](#l2.14)

       /* It's not ideal to clear the error condition,[](#l2.15)

          but this function is documented as not setting[](#l2.16)

          an exception, and I don't want to change that.[](#l2.17)

          When PyType_Ready() can't proceed, it won't[](#l2.18)

          set the "ready" flag, so future attempts to ready[](#l2.19)

          the same type will call it again -- hopefully[](#l2.20)

          in a context that propagates the exception out.[](#l2.21)

```
       */[](#l2.22)
```
```
       PyErr_Clear();[](#l2.23)
```
```
       return NULL;[](#l2.24)
```
```
   }[](#l2.25)
```
```
   mro = type->tp_mro;[](#l2.26)
```
```
   if (mro == NULL) {[](#l2.27)
```
```
       return NULL;[](#l2.28)
```
```
   }[](#l2.29)
```
}

res = NULL; assert(PyTuple_Check(mro));