[pypy-svn] r18726 - pypy/dist/pypy/rpython

[boria at codespeak.net]

Author: boria
Date: Mon Oct 17 23:01:13 2005
New Revision: 18726

Modified:
   pypy/dist/pypy/rpython/rbuiltin.py
   pypy/dist/pypy/rpython/typesystem.py
Log:
* Small cleanup. No need to treat BUILTIN_TYPER as a special case here.


Modified: pypy/dist/pypy/rpython/rbuiltin.py
==============================================================================
--- pypy/dist/pypy/rpython/rbuiltin.py	(original)
+++ pypy/dist/pypy/rpython/rbuiltin.py	Mon Oct 17 23:01:13 2005
@@ -57,7 +57,8 @@
         except KeyError:
             try:
                 rtyper = hop.rtyper
-                bltintyper = rtyper.type_system.BUILTIN_TYPER[self.builtinfunc]
+                bltintyper = rtyper.type_system.rbuiltin.\
+                                    BUILTIN_TYPER[self.builtinfunc]
             except KeyError:
                 raise TyperError("don't know about built-in function %r" % (
                     self.builtinfunc,))

Modified: pypy/dist/pypy/rpython/typesystem.py
==============================================================================
--- pypy/dist/pypy/rpython/typesystem.py	(original)
+++ pypy/dist/pypy/rpython/typesystem.py	Mon Oct 17 23:01:13 2005
@@ -17,16 +17,11 @@
                                   None, None, ['__doc__'])
             except ImportError:
                 return None
-        if name in ('rclass', 'rpbc'):
+        if name in ('rclass', 'rpbc', 'rbuiltin'):
             mod = load(name)
             if mod is not None:
                 setattr(self, name, mod)
                 return mod
-        elif name == "BUILTIN_TYPER":
-            rbuiltin = load('rbuiltin')
-            if rbuiltin is not None:
-                self.BUILTIN_TYPER = rbuiltin.BUILTIN_TYPER
-                return self.BUILTIN_TYPER
 
         raise AttributeError(name)