Author: Armin Rigo <[email protected]>
Branch: py3.5
Changeset: r90345:4ff73331b9e8
Date: 2017-02-25 08:30 +0100
http://bitbucket.org/pypy/pypy/changeset/4ff73331b9e8/
Log: fixes
diff --git a/pypy/module/bz2/test/test_bz2_compdecomp.py
b/pypy/module/bz2/test/test_bz2_compdecomp.py
--- a/pypy/module/bz2/test/test_bz2_compdecomp.py
+++ b/pypy/module/bz2/test/test_bz2_compdecomp.py
@@ -50,7 +50,7 @@
if cls.runappdirect:
cls.w_decompress = decompress
else:
- @gateway.unwrap_spec(data=bytes)
+ @gateway.unwrap_spec(data='bytes')
def decompress_w(space, data):
return space.newbytes(decompress(cls, data))
cls.w_decompress = cls.space.wrap(gateway.interp2app(decompress_w))
@@ -228,7 +228,7 @@
if cls.runappdirect:
cls.w_decompress = decompress
else:
- @gateway.unwrap_spec(data=bytes)
+ @gateway.unwrap_spec(data='bytes')
def decompress_w(space, data):
return space.newbytes(decompress(cls, data))
cls.w_decompress = cls.space.wrap(gateway.interp2app(decompress_w))
diff --git a/pypy/module/struct/interp_struct.py
b/pypy/module/struct/interp_struct.py
--- a/pypy/module/struct/interp_struct.py
+++ b/pypy/module/struct/interp_struct.py
@@ -208,8 +208,8 @@
__length_hint__=interp2app(W_UnpackIter.descr_length_hint)
)
-@unwrap_spec(format='text')
-def iter_unpack(space, format, w_buffer):
+def iter_unpack(space, w_format, w_buffer):
+ format = text_or_bytes_w(space, w_format)
w_struct = W_Struct(space, format)
return W_UnpackIter(space, w_struct, w_buffer)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
