[pypy-commit] pypy py3k: hg merge default

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: py3k
Changeset: r87614:b9150b667bb5
Date: 2016-10-06 16:45 +0100
http://bitbucket.org/pypy/pypy/changeset/b9150b667bb5/

Log:	hg merge default

diff --git a/pypy/module/cpyext/test/test_bytesobject.py b/pypy/module/cpyext/test/test_bytesobject.py
--- a/pypy/module/cpyext/test/test_bytesobject.py
+++ b/pypy/module/cpyext/test/test_bytesobject.py
@@ -105,7 +105,7 @@
              '''),
             ])
         s = module.alloc_rw()
-        assert s == b'works' + b'\x00' * 5
+        assert s[:6] == b'works\0'  # s[6:10] contains random garbage
         s = module.tpalloc()
         assert s == b'\x00' * 10