diff options
| author | Barry Warsaw <barry@python.org> | 2016-01-11 20:53:51 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2016-01-11 20:53:51 (GMT) |
| commit | 305e3557e94735bbccde8ab2b881c93afa067e13 (patch) | |
| tree | 0c9448c2b1803885b908d163b837ea0f94544ebc | |
| parent | 0633cb7d7a19b2b300bf90edd72bf80ff707bfd3 (diff) | |
| parent | 3d220cc4d7be841e97d2b43bde6534081b06c001 (diff) | |
| download | cpython-305e3557e94735bbccde8ab2b881c93afa067e13.zip cpython-305e3557e94735bbccde8ab2b881c93afa067e13.tar.gz cpython-305e3557e94735bbccde8ab2b881c93afa067e13.tar.bz2 | |
Merge heads.
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Objects/typeobject.c | 9 |
2 files changed, 0 insertions, 12 deletions
@@ -10,9 +10,6 @@ Release date: tba Core and Builtins ----------------- -- Issue #22995: [UPDATE] Comment out the one of the pickleability tests in - _PyObject_GetState() due to regressions observed in Cython-based projects. - - Issue #25961: Disallowed null characters in the type name. - Issue #25973: Fix segfault when an invalid nonlocal statement binds a name diff --git a/Objects/typeobject.c b/Objects/typeobject.c index f92f1e9..db15cf6 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -3872,14 +3872,6 @@ _PyObject_GetState(PyObject *obj, int required) } assert(slotnames == Py_None || PyList_Check(slotnames)); -#if 0 - /* 2016-01-11 barry - This clause breaks at least three packages which - rely on Cython: kivy, pysam, and s3ql. Cython may be doing - something funny under the hood, but as this is clearly a regression - and the rationale for this prohibition is suspect, I am commenting - this out. Perhaps it should just be removed. See issue #22995 for - details. - */ if (required) { Py_ssize_t basicsize = PyBaseObject_Type.tp_basicsize; if (obj->ob_type->tp_dictoffset) @@ -3897,7 +3889,6 @@ _PyObject_GetState(PyObject *obj, int required) return NULL; } } -#endif if (slotnames != Py_None && Py_SIZE(slotnames) > 0) { PyObject *slots; |