aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatti Picus <matti.picus@gmail.com>2019-10-15 10:29:05 +0300
committerMatti Picus <matti.picus@gmail.com>2019-10-15 10:29:05 +0300
commit8291e51984a378636e85f9d1c775046813c6a5dd (patch)
tree9694f120096e2da609fd13681b13fbcffe176bc5 /pypy/interpreter/gateway.py
parentSome more cases of W_AbstractXxx but where the test already passes (diff)
downloadpypy-8291e51984a378636e85f9d1c775046813c6a5dd.tar.gz
pypy-8291e51984a378636e85f9d1c775046813c6a5dd.tar.bz2
pypy-8291e51984a378636e85f9d1c775046813c6a5dd.zip
fix translation: BuiltinCode inherits from W_Root
Diffstat (limited to 'pypy/interpreter/gateway.py')
-rw-r--r--pypy/interpreter/gateway.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/pypy/interpreter/gateway.py b/pypy/interpreter/gateway.py
index 0320605ad5..1115fb2d06 100644
--- a/pypy/interpreter/gateway.py
+++ b/pypy/interpreter/gateway.py
@@ -755,7 +755,7 @@ class BuiltinCode(Code):
except DescrMismatch:
if w_obj is not None:
args = args.prepend(w_obj)
- return self.descr_call_mismatch(space, args)
+ return self._type_unwrap_mismatch(space, args)
except Exception as e:
self.handle_exception(space, e)
w_result = None
@@ -763,7 +763,7 @@ class BuiltinCode(Code):
w_result = space.w_None
return w_result
- def descr_call_mismatch(self, space, args):
+ def _type_unwrap_mismatch(self, space, args):
w_obj = args.firstarg()
if w_obj is None:
raise oefmt(space.w_SystemError, "unexpected DescrMismatch error")
@@ -794,7 +794,7 @@ class BuiltinCodePassThroughArguments0(BuiltinCode):
try:
w_result = self.func__args__(space, args)
except DescrMismatch:
- return self.descr_call_mismatch(space, args)
+ return self._type_unwrap_mismatch(space, args)
except Exception as e:
self.handle_exception(space, e)
w_result = None
@@ -812,7 +812,7 @@ class BuiltinCodePassThroughArguments1(BuiltinCode):
try:
w_result = self.func__args__(space, w_obj, args)
except DescrMismatch:
- return self.descr_call_mismatch(space, args.prepend(w_obj))
+ return self._type_unwrap_mismatch(space, args.prepend(w_obj))
except Exception as e:
self.handle_exception(space, e)
w_result = None
@@ -852,7 +852,7 @@ class BuiltinCode1(BuiltinCode):
try:
w_result = self.fastfunc_1(space, w1)
except DescrMismatch:
- return self.descr_call_mismatch(space,
+ return self._type_unwrap_mismatch(space,
Arguments(space, [w1]))
except Exception as e:
self.handle_exception(space, e)
@@ -876,7 +876,7 @@ class BuiltinCode2(BuiltinCode):
try:
w_result = self.fastfunc_2(space, w1, w2)
except DescrMismatch:
- return self.descr_call_mismatch(space,
+ return self._type_unwrap_mismatch(space,
Arguments(space, [w1, w2]))
except Exception as e:
self.handle_exception(space, e)
@@ -901,7 +901,7 @@ class BuiltinCode3(BuiltinCode):
try:
w_result = self.fastfunc_3(space, w1, w2, w3)
except DescrMismatch:
- return self.descr_call_mismatch(space,
+ return self._type_unwrap_mismatch(space,
Arguments(space, [w1, w2, w3]))
except Exception as e:
self.handle_exception(space, e)
@@ -927,7 +927,7 @@ class BuiltinCode4(BuiltinCode):
try:
w_result = self.fastfunc_4(space, w1, w2, w3, w4)
except DescrMismatch:
- return self.descr_call_mismatch(space,
+ return self._type_unwrap_mismatch(space,
Arguments(space,
[w1, w2, w3, w4]))
except Exception as e: