[pypy-commit] pypy stdlib-3.6.9: hg merge py3.6

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: stdlib-3.6.9
Changeset: r97057:e4ecd24cf733
Date: 2019-08-02 21:17 +0100
http://bitbucket.org/pypy/pypy/changeset/e4ecd24cf733/

Log:	hg merge py3.6

diff --git a/pypy/module/cpyext/unicodeobject.py b/pypy/module/cpyext/unicodeobject.py
--- a/pypy/module/cpyext/unicodeobject.py
+++ b/pypy/module/cpyext/unicodeobject.py
@@ -59,7 +59,7 @@
     2: '_2BYTE_KIND',
     4: '_4BYTE_KIND',
     }
-                
+
 
 def new_empty_unicode(space, length):
     """
@@ -1089,7 +1089,7 @@
     c_length = get_wsize(ref)
 
     size = c_length
-    if copy_null:
+    if rffi.cast(lltype.Signed, copy_null):
         size += 1
     if not pbuffer:   # internal, for PyUnicode_AsUCS4Copy()
         pbuffer = lltype.malloc(rffi.CArray(Py_UCS4), size,