revert a37cc3d926ec (#5322)

1 files changed, 0 insertions, 97 deletions

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index e02f691..fc965f7 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -3,7 +3,6 @@ import gc
 import sys
 import types
 import unittest
-import warnings
 import weakref
 
 from copy import deepcopy
@@ -1551,84 +1550,6 @@ order (MRO) for bases """
         self.assertEqual(b.foo, 3)
         self.assertEqual(b.__class__, D)
 
-    def test_bad_new(self):
-        self.assertRaises(TypeError, object.__new__)
-        self.assertRaises(TypeError, object.__new__, '')
-        self.assertRaises(TypeError, list.__new__, object)
-        self.assertRaises(TypeError, object.__new__, list)
-        class C(object):
-            __new__ = list.__new__
-        self.assertRaises(TypeError, C)
-        class C(list):
-            __new__ = object.__new__
-        self.assertRaises(TypeError, C)
-
-    def test_object_new(self):
-        class A(object):
-            pass
-        object.__new__(A)
-        self.assertRaises(TypeError, object.__new__, A, 5)
-        object.__init__(A())
-        self.assertRaises(TypeError, object.__init__, A(), 5)
-
-        class A(object):
-            def __init__(self, foo):
-                self.foo = foo
-        object.__new__(A)
-        object.__new__(A, 5)
-        object.__init__(A(3))
-        self.assertRaises(TypeError, object.__init__, A(3), 5)
-
-        class A(object):
-            def __new__(cls, foo):
-                return object.__new__(cls)
-        object.__new__(A)
-        self.assertRaises(TypeError, object.__new__, A, 5)
-        object.__init__(A(3))
-        object.__init__(A(3), 5)
-
-        class A(object):
-            def __new__(cls, foo):
-                return object.__new__(cls)
-            def __init__(self, foo):
-                self.foo = foo
-        object.__new__(A)
-        with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter('always', DeprecationWarning)
-            a = object.__new__(A, 5)
-        self.assertEqual(type(a), A)
-        self.assertEqual(len(w), 1)
-        object.__init__(A(3))
-        a = A(3)
-        with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter('always', DeprecationWarning)
-            object.__init__(a, 5)
-        self.assertEqual(a.foo, 3)
-        self.assertEqual(len(w), 1)
-
-    def test_restored_object_new(self):
-        class A(object):
-            def __new__(cls, *args, **kwargs):
-                raise AssertionError
-        self.assertRaises(AssertionError, A)
-        class B(A):
-            __new__ = object.__new__
-            def __init__(self, foo):
-                self.foo = foo
-        with warnings.catch_warnings():
-            warnings.simplefilter('error', DeprecationWarning)
-            b = B(3)
-        self.assertEqual(b.foo, 3)
-        self.assertEqual(b.__class__, B)
-        del B.__new__
-        self.assertRaises(AssertionError, B)
-        del A.__new__
-        with warnings.catch_warnings():
-            warnings.simplefilter('error', DeprecationWarning)
-            b = B(3)
-        self.assertEqual(b.foo, 3)
-        self.assertEqual(b.__class__, B)
-
     def test_altmro(self):
         # Testing mro() and overriding it...
         class A(object):
@@ -3835,24 +3756,6 @@ order (MRO) for bases """
         self.assertEqual(isinstance(d, D), True)
         self.assertEqual(d.foo, 1)
 
-        class C(object):
-            @staticmethod
-            def __new__(*args):
-                return args
-        self.assertEqual(C(1, 2), (C, 1, 2))
-        class D(C):
-            pass
-        self.assertEqual(D(1, 2), (D, 1, 2))
-
-        class C(object):
-            @classmethod
-            def __new__(*args):
-                return args
-        self.assertEqual(C(1, 2), (C, C, 1, 2))
-        class D(C):
-            pass
-        self.assertEqual(D(1, 2), (D, D, 1, 2))
-
     def test_imul_bug(self):
         # Testing for __imul__ problems...
         # SF bug 544647