[pypy-svn] r58390 - in pypy/branch/2.5-merge/pypy: interpreter objspace/flow
fijal at codespeak.net
fijal at codespeak.net
Tue Sep 23 18:09:20 CEST 2008
Author: fijal
Date: Tue Sep 23 18:09:19 2008
New Revision: 58390
Modified:
pypy/branch/2.5-merge/pypy/interpreter/baseobjspace.py
pypy/branch/2.5-merge/pypy/interpreter/error.py
pypy/branch/2.5-merge/pypy/objspace/flow/objspace.py
Log:
Hack differently, more the way it is on trunk
Modified: pypy/branch/2.5-merge/pypy/interpreter/baseobjspace.py
==============================================================================
--- pypy/branch/2.5-merge/pypy/interpreter/baseobjspace.py (original)
+++ pypy/branch/2.5-merge/pypy/interpreter/baseobjspace.py Tue Sep 23 18:09:19 2008
@@ -806,7 +806,6 @@
# module when it is loaded.
return self.type(w_obj)
-
def eval(self, expression, w_globals, w_locals):
"NOT_RPYTHON: For internal debugging."
import types
Modified: pypy/branch/2.5-merge/pypy/interpreter/error.py
==============================================================================
--- pypy/branch/2.5-merge/pypy/interpreter/error.py (original)
+++ pypy/branch/2.5-merge/pypy/interpreter/error.py Tue Sep 23 18:09:19 2008
@@ -175,7 +175,7 @@
while space.is_true(space.isinstance(w_type, space.w_tuple)):
w_type = space.getitem(w_type, space.wrap(0))
- if (space.is_true(space.abstract_isclass(w_type)) and
+ if (space.abstract_isclass_w(w_type) and
is_valid_exception_class(space, w_type)):
# this is for all cases of the form (Class, something)
if space.is_w(w_value, space.w_None):
Modified: pypy/branch/2.5-merge/pypy/objspace/flow/objspace.py
==============================================================================
--- pypy/branch/2.5-merge/pypy/objspace/flow/objspace.py (original)
+++ pypy/branch/2.5-merge/pypy/objspace/flow/objspace.py Tue Sep 23 18:09:19 2008
@@ -217,19 +217,6 @@
return ecls
return None
-
- def abstract_issubclass(self, w_obj, w_cls, failhard=False):
- return self.issubtype(w_obj, w_cls)
-
- def abstract_isinstance(self, w_obj, w_cls):
- return self.isinstance(w_obj, w_cls)
-
- def abstract_isclass(self, w_obj):
- return self.isinstance(w_obj, self.w_type)
-
- def abstract_getclass(self, w_obj):
- return self.type(w_obj)
-
def build_flow(self, func, constargs={}):
"""
"""
More information about the Pypy-commit
mailing list