[pypy-svn] r40580 - pypy/dist/pypy/module/pypymagic

[cfbolz at codespeak.net]

Author: cfbolz
Date: Fri Mar 16 13:46:49 2007
New Revision: 40580

Modified:
   pypy/dist/pypy/module/pypymagic/__init__.py
   pypy/dist/pypy/module/pypymagic/interp_magic.py
Log:
don't put stuff into pypymagic that does not work anyway


Modified: pypy/dist/pypy/module/pypymagic/__init__.py
==============================================================================
--- pypy/dist/pypy/module/pypymagic/__init__.py	(original)
+++ pypy/dist/pypy/module/pypymagic/__init__.py	Fri Mar 16 13:46:49 2007
@@ -8,8 +8,15 @@
 
     interpleveldefs = {
         'pypy_repr'             : 'interp_magic.pypy_repr',
-        'isfake'                : 'interp_magic.isfake',
-        'interp_pdb'            : 'interp_magic.interp_pdb',
-        'method_cache_counter'  : 'interp_magic.method_cache_counter',
-        'reset_method_cache_counter'  : 'interp_magic.reset_method_cache_counter',
     }
+
+    def setup_after_space_initialization(self):
+        if not self.space.config.translating:
+            self.extra_interpdef('isfake', 'interp_magic.isfake')
+            self.extra_interpdef('interp_pdb', 'interp_magic.interp_pdb')
+        if self.space.config.objspace.std.withmethodcachecounter:
+            self.extra_interpdef('method_cache_counter',
+                                 'interp_magic.method_cache_counter')
+            self.extra_interpdef('reset_method_cache_counter',
+                                 'interp_magic.reset_method_cache_counter')
+

Modified: pypy/dist/pypy/module/pypymagic/interp_magic.py
==============================================================================
--- pypy/dist/pypy/module/pypymagic/interp_magic.py	(original)
+++ pypy/dist/pypy/module/pypymagic/interp_magic.py	Fri Mar 16 13:46:49 2007
@@ -14,26 +14,19 @@
 def interp_pdb(space):
     """Run an interp-level pdb.
     This is not available in translated versions of PyPy."""
-    if we_are_translated():
-        raise OperationError(space.w_NotImplementedError,
-                             space.wrap("Cannot use interp-level pdb in translated pypy"))
-    else:
-        import pdb
-        pdb.set_trace()
+    assert not we_are_translated()
+    import pdb
+    pdb.set_trace()
 
 def method_cache_counter(space, name):
-    if not space.config.objspace.std.withmethodcachecounter:
-        raise OperationError(space.w_NotImplementedError,
-                             space.wrap("not implemented"))
+    assert space.config.objspace.std.withmethodcachecounter
     ec = space.getexecutioncontext()
     return space.newtuple([space.newint(ec.method_cache_hits.get(name, 0)),
                            space.newint(ec.method_cache_misses.get(name, 0)),])
 method_cache_counter.unwrap_spec = [ObjSpace, str]
 
 def reset_method_cache_counter(space):
-    if not space.config.objspace.std.withmethodcachecounter:
-        raise OperationError(space.w_NotImplementedError,
-                             space.wrap("not implemented"))
+    assert space.config.objspace.std.withmethodcachecounter
     ec = space.getexecutioncontext()
     ec.method_cache_misses = {}
     ec.method_cache_hits = {}