Author: Armin Rigo <ar...@tunes.org>
Branch: py3.5
Changeset: r89527:daf8de0e7dab
Date: 2017-01-12 19:25 +0100
http://bitbucket.org/pypy/pypy/changeset/daf8de0e7dab/
Log: merge heads
diff --git a/lib_pypy/_tkinter/tclobj.py b/lib_pypy/_tkinter/tclobj.py
--- a/lib_pypy/_tkinter/tclobj.py
+++ b/lib_pypy/_tkinter/tclobj.py
@@ -185,7 +185,7 @@
def __repr__(self):
return "<%s object at 0x%x>" % (
- self.typename, tkffi.cast("intptr_t", self._value))
+ self.typename, int(tkffi.cast("intptr_t", self._value)))
def __eq__(self, other):
if not isinstance(other, Tcl_Obj):
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
@@ -193,6 +193,12 @@
def test_hex(self):
assert memoryview(b"abc").hex() == u'616263'
+ def test_hex_long(self):
+ x = b'0' * 200000
+ m1 = memoryview(x)
+ m2 = m1[::-1]
+ assert m2.hex() == '30' * 200000
+
def test_memoryview_cast(self):
m1 = memoryview(b'abcdefgh')
m2 = m1.cast('I')
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
