Author: Armin Rigo <[email protected]>
Branch:
Changeset: r68389:8d92f7cf8c55
Date: 2013-12-06 21:27 +0100
http://bitbucket.org/pypy/pypy/changeset/8d92f7cf8c55/
Log: update to cffi/96939e956ff6
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,6 @@
def descr_str(self, space):
return space.wrap(self.buffer.as_str())
- def descr_unicode(self, space):
- return space.repr(space.wrap(self))
-
MiniBuffer.typedef = TypeDef(
"buffer",
@@ -75,7 +72,6 @@
__buffer__ = interp2app(MiniBuffer.descr__buffer__),
__weakref__ = make_weakref_descr(MiniBuffer),
__str__ = interp2app(MiniBuffer.descr_str),
- __unicode__ = interp2app(MiniBuffer.descr_unicode),
)
MiniBuffer.typedef.acceptable_as_base_class = False
diff --git a/pypy/module/_cffi_backend/test/_backend_test_c.py
b/pypy/module/_cffi_backend/test/_backend_test_c.py
--- a/pypy/module/_cffi_backend/test/_backend_test_c.py
+++ b/pypy/module/_cffi_backend/test/_backend_test_c.py
@@ -2143,8 +2143,13 @@
c = newp(BCharArray, b"hi there")
#
buf = buffer(c)
- assert unicode(buf).startswith('<_cffi_backend.buffer object at 0x')
+ assert repr(buf).startswith('<_cffi_backend.buffer object at 0x')
assert bytes(buf) == b"hi there\x00"
+ if sys.version_info < (3,):
+ assert str(buf) == "hi there\x00"
+ assert unicode(buf) == u+"hi there\x00"
+ else:
+ assert str(buf) == repr(buf)
# --mb_length--
assert len(buf) == len(b"hi there\x00")
# --mb_item--
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
