Author: Carl Friedrich Bolz <cfb...@gmx.de>
Branch:
Changeset: r65349:0dbb3ef0039b
Date: 2013-07-11 19:47 +0200
http://bitbucket.org/pypy/pypy/changeset/0dbb3ef0039b/
Log: a few more missing expected_lengths
diff --git a/pypy/interpreter/pyframe.py b/pypy/interpreter/pyframe.py
--- a/pypy/interpreter/pyframe.py
+++ b/pypy/interpreter/pyframe.py
@@ -371,7 +371,7 @@
from pypy.module._pickle_support import maker # helper fns
from pypy.interpreter.pycode import PyCode
from pypy.interpreter.module import Module
- args_w = space.unpackiterable(w_args)
+ args_w = space.unpackiterable(w_args, 18)
w_f_back, w_builtin, w_pycode, w_valuestack, w_blockstack,
w_exc_value, w_tb,\
w_globals, w_last_instr, w_finished, w_f_lineno, w_fastlocals,
w_f_locals, \
w_f_trace, w_instr_lb, w_instr_ub, w_instr_prev_plus_one, w_cells
= args_w
diff --git a/pypy/interpreter/test/test_zzpickle_and_slow.py
b/pypy/interpreter/test/test_zzpickle_and_slow.py
--- a/pypy/interpreter/test/test_zzpickle_and_slow.py
+++ b/pypy/interpreter/test/test_zzpickle_and_slow.py
@@ -226,6 +226,10 @@
restore_top_frame(f1, saved)
f2 = pickle.loads(pckl)
+ def test_frame_setstate_crash(self):
+ import sys
+ raises(ValueError, sys._getframe().__setstate__, [])
+
def test_pickle_traceback(self):
def f():
try:
diff --git a/pypy/module/_socket/interp_socket.py
b/pypy/module/_socket/interp_socket.py
--- a/pypy/module/_socket/interp_socket.py
+++ b/pypy/module/_socket/interp_socket.py
@@ -473,7 +473,7 @@
option_ptr = rffi.cast(rffi.INTP, value_ptr)
option_ptr[0] = space.int_w(w_option)
elif cmd == _c.SIO_KEEPALIVE_VALS:
- w_onoff, w_time, w_interval =
space.unpackiterable(w_option)
+ w_onoff, w_time, w_interval =
space.unpackiterable(w_option, 3)
option_ptr = rffi.cast(lltype.Ptr(_c.tcp_keepalive),
value_ptr)
option_ptr.c_onoff = space.uint_w(w_onoff)
option_ptr.c_keepalivetime = space.uint_w(w_time)
diff --git a/pypy/module/micronumpy/interp_dtype.py
b/pypy/module/micronumpy/interp_dtype.py
--- a/pypy/module/micronumpy/interp_dtype.py
+++ b/pypy/module/micronumpy/interp_dtype.py
@@ -318,7 +318,7 @@
if not base.issequence_w(space, w_shape):
w_shape = space.newtuple([w_shape,])
else:
- w_fldname, w_flddesc = space.fixedview(w_elem)
+ w_fldname, w_flddesc = space.fixedview(w_elem, 2)
subdtype = descr__new__(space, space.gettypefor(W_Dtype), w_flddesc,
w_shape=w_shape)
fldname = space.str_w(w_fldname)
if fldname in fields:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
