mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-15 21:26:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

backout 3c9512d8ac0d

Browse source
This commit is contained in:
Benjamin Peterson 2016-05-28 14:04:40 -07:00
parent 338502b307
commit c352620c92
3 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/test/test_descr.py
View file

@ -4564,14 +4564,6 @@ order (MRO) for bases """
self.assertRegex(repr(method), self.assertRegex(repr(method),
r"<bound method qualname of <object object at .*>>") r"<bound method qualname of <object object at .*>>")
def test_deleting_new_in_subclasses(self):
class X:
def __init__(self, a):
pass
X.__new__ = None
del X.__new__
X(1) # should work
class DictProxyTests(unittest.TestCase): class DictProxyTests(unittest.TestCase):
def setUp(self): def setUp(self):

2
Misc/NEWS
View file

@ -80,8 +80,6 @@ Core and Builtins
(``int``) and ``f2()`` returns ``1.0`` (``int``), even if ``1`` and ``1.0`` (``int``) and ``f2()`` returns ``1.0`` (``int``), even if ``1`` and ``1.0``
are equal. are equal.
- Issue #25731: Fix set and deleting __new__ on a class.
- Issue #22995: [UPDATE] Comment out the one of the pickleability tests in - Issue #22995: [UPDATE] Comment out the one of the pickleability tests in
_PyObject_GetState() due to regressions observed in Cython-based projects. _PyObject_GetState() due to regressions observed in Cython-based projects.

2
Objects/typeobject.c
View file

@ -6777,7 +6777,7 @@ update_one_slot(PyTypeObject *type, slotdef *p)
sanity checks and constructing a new argument sanity checks and constructing a new argument
list. Cut all that nonsense short -- this speeds list. Cut all that nonsense short -- this speeds
up instance creation tremendously. */ up instance creation tremendously. */
specific = (void *)((PyTypeObject *)PyCFunction_GET_SELF(descr))->tp_new; specific = (void *)type->tp_new;
/* XXX I'm not 100% sure that there isn't a hole /* XXX I'm not 100% sure that there isn't a hole
in this reasoning that requires additional in this reasoning that requires additional
sanity checks. I'll buy the first person to sanity checks. I'll buy the first person to