SF patch 1495675: Remove types.InstanceType and new.instance

(Collin Winter)

2 files changed, 2 insertions, 13 deletions

diff --git a/Lib/test/output/test_new b/Lib/test/output/test_new
index b7f2ed97f7..fd225f34ef 100644
--- a/Lib/test/output/test_new
+++ b/Lib/test/output/test_new
@@ -1,7 +1,6 @@
 test_new
 new.module()
 new.classobj()
-new.instance()
 new.instancemethod()
 new.function()
 new.code()
diff --git a/Lib/test/test_new.py b/Lib/test/test_new.py
index 4aab1e268b..2819923e0b 100644
--- a/Lib/test/test_new.py
+++ b/Lib/test/test_new.py
@@ -21,22 +21,12 @@ print 'new.classobj()'
 C = new.classobj('Spam', (Spam.Eggs,), {'get_more_yolks': get_more_yolks})
 if verbose:
     print C
-print 'new.instance()'
-c = new.instance(C, {'yolks': 3})
-if verbose:
-    print c
-o = new.instance(C)
-verify(o.__dict__ == {},
-       "new __dict__ should be empty")
-del o
-o = new.instance(C, None)
-verify(o.__dict__ == {},
-       "new __dict__ should be empty")
-del o
 
 def break_yolks(self):
     self.yolks = self.yolks - 2
 print 'new.instancemethod()'
+c = C()
+c.yolks = 3
 im = new.instancemethod(break_yolks, c, C)
 if verbose:
     print im