Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge 3.5

This commit is contained in:
Benjamin Peterson 2016-05-28 14:05:11 -07:00
parent dc4f7c09cc c352620c92
commit 6ca4260219
3 changed files with 3 additions and 10 deletions
Show Stats 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):

3
Misc/NEWS
View File

@ -204,7 +204,8 @@ Core and Builtins
- Issue #25791: If __package__ != __spec__.parent or if neither __package__ or - Issue #25791: If __package__ != __spec__.parent or if neither __package__ or
__spec__ are defined then ImportWarning is raised. __spec__ are defined then ImportWarning is raised.
- Issue #25731: Fix set and deleting __new__ on a class. - 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 #25961: Disallowed null characters in the type name.

2
Objects/typeobject.c
View File

@ -6790,7 +6790,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