merge 3.5

This commit is contained in:
Benjamin Peterson 2016-05-28 14:05:11 -07:00
commit 6ca4260219
3 changed files with 3 additions and 10 deletions

View file

@ -4564,14 +4564,6 @@ order (MRO) for bases """
self.assertRegex(repr(method),
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):
def setUp(self):