[pypy-svn] r14570 - pypy/branch/pypy-translation-snapshot/interpreter

[arigo at codespeak.net]

Author: arigo
Date: Tue Jul 12 21:52:18 2005
New Revision: 14570

Modified:
   pypy/branch/pypy-translation-snapshot/interpreter/typedef.py
Log:
Merged revision 14569 from the trunk.


Modified: pypy/branch/pypy-translation-snapshot/interpreter/typedef.py
==============================================================================
--- pypy/branch/pypy-translation-snapshot/interpreter/typedef.py	(original)
+++ pypy/branch/pypy-translation-snapshot/interpreter/typedef.py	Tue Jul 12 21:52:18 2005
@@ -7,7 +7,7 @@
 from pypy.interpreter.error import OperationError
 from pypy.tool.cache import Cache
 from pypy.tool.sourcetools import compile2
-import new
+from pypy.rpython.objectmodel import instantiate
 
 class TypeDef:
     def __init__(self, __name, __base=None, **rawdict):
@@ -132,14 +132,6 @@
 
     return subcls
 
-def instantiate(cls):
-    "Create an empty instance of 'cls'."
-    if isinstance(cls, type):
-        return object.__new__(cls)
-    else:
-        return new.instance(cls)
-instantiate._annspecialcase_ = "override:instantiate"
-
 def make_descr_typecheck_wrapper(func, extraargs=(), cls=None):
     if func is None:
         return None