Merge from 3.6.

This commit is contained in:
Serhiy Storchaka 2016-12-14 19:54:38 +02:00
commit 386072ebe0
3 changed files with 3 additions and 31 deletions

View file

@ -1662,6 +1662,7 @@ order (MRO) for bases """
self.assertEqual(b.foo, 3)
self.assertEqual(b.__class__, D)
@unittest.expectedFailure
def test_bad_new(self):
self.assertRaises(TypeError, object.__new__)
self.assertRaises(TypeError, object.__new__, '')
@ -1708,6 +1709,7 @@ order (MRO) for bases """
object.__init__(A(3))
self.assertRaises(TypeError, object.__init__, A(3), 5)
@unittest.expectedFailure
def test_restored_object_new(self):
class A(object):
def __new__(cls, *args, **kwargs):