Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r71079:f1fa7709d05e
Date: 2014-04-29 16:09 -0700
http://bitbucket.org/pypy/pypy/changeset/f1fa7709d05e/
Log: fix
diff --git a/pypy/module/_cffi_backend/cbuffer.py
b/pypy/module/_cffi_backend/cbuffer.py
--- a/pypy/module/_cffi_backend/cbuffer.py
+++ b/pypy/module/_cffi_backend/cbuffer.py
@@ -62,9 +62,8 @@
res = self.buffer.getslice(start, stop, step, size)
return space.wrapbytes(res)
- @unwrap_spec(newstring='bufferstr')
- def descr_setitem(self, space, w_index, newstring):
- _buffer_setitem(space, self.buffer, w_index, newstring)
+ def descr_setitem(self, space, w_index, w_newstring):
+ _buffer_setitem(space, self.buffer, w_index, w_newstring)
MiniBuffer.typedef = TypeDef(
diff --git a/pypy/module/_ssl/interp_ssl.py b/pypy/module/_ssl/interp_ssl.py
--- a/pypy/module/_ssl/interp_ssl.py
+++ b/pypy/module/_ssl/interp_ssl.py
@@ -430,7 +430,7 @@
rwbuffer = None
if not space.is_none(w_buf):
- rwbuffer = space.rwbuffer_w(w_buf)
+ rwbuffer = space.getarg_w('w*', w_buf)
lgt = rwbuffer.getlength()
if num_bytes < 0 or num_bytes > lgt:
num_bytes = lgt
diff --git a/pypy/objspace/std/test/test_memoryobject.py
b/pypy/objspace/std/test/test_memoryobject.py
--- a/pypy/objspace/std/test/test_memoryobject.py
+++ b/pypy/objspace/std/test/test_memoryobject.py
@@ -29,7 +29,7 @@
assert data == bytearray(eval("b'z123fg'"))
v[0:3] = v[2:5]
assert data == bytearray(eval("b'23f3fg'"))
- exc = raises(ValueError, "v[2] = 'spam'")
+ exc = raises(ValueError, "v[2] = b'spam'")
assert str(exc.value) == "cannot modify size of memoryview object"
exc = raises(NotImplementedError, "v[0:2:2] = 'spam'")
assert str(exc.value) == ""
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
