[pypy-commit] pypy py3k-update: Fix translation

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: py3k-update
Changeset: r84109:4e240e7e8307
Date: 2016-05-01 22:25 +0100
http://bitbucket.org/pypy/pypy/changeset/4e240e7e8307/

Log:	Fix translation

diff --git a/pypy/module/cpyext/object.py b/pypy/module/cpyext/object.py
--- a/pypy/module/cpyext/object.py
+++ b/pypy/module/cpyext/object.py
@@ -71,7 +71,7 @@
 def _PyObject_GC_New(space, type):
     return _PyObject_New(space, type)
 
- at cpython_api([PyTypeObjectPtr, Py_ssize_t], PyObject)
+ at cpython_api([PyTypeObjectPtr, Py_ssize_t], PyObject, result_is_ll=True)
 def _PyObject_GC_NewVar(space, type, itemcount):
     return _PyObject_NewVar(space, type, itemcount)
 
@@ -446,7 +446,7 @@
 
         bufferp[0] = rffi.cast(rffi.CCHARP, view.c_buf)
         sizep[0] = view.c_len
-            
+
         if pb.c_bf_releasebuffer:
             generic_cpy_call(space, pb.c_bf_releasebuffer,
                              obj, view)
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
@@ -358,7 +358,7 @@
     # PyPy supposes Py_UNICODE == wchar_t
     return PyUnicode_FromUnicode(space, wchar_p, length)
 
- at cpython_api([PyObject, CONST_STRING], PyObject, result_is_ll=True)
+ at cpython_api([PyObject, CONST_STRING], PyObject)
 def _PyUnicode_AsDefaultEncodedString(space, w_unicode, errors):
     return PyUnicode_AsEncodedString(space, w_unicode, lltype.nullptr(rffi.CCHARP.TO), errors)
 
diff --git a/pypy/objspace/std/mapdict.py b/pypy/objspace/std/mapdict.py
--- a/pypy/objspace/std/mapdict.py
+++ b/pypy/objspace/std/mapdict.py
@@ -470,7 +470,6 @@
         self._set_mapdict_storage_and_map(new_obj.storage, new_obj.map)
 
     def user_setup(self, space, w_subtype):
-        self.space = space
         assert (not self.typedef.hasdict or
                 isinstance(w_subtype.terminator, NoDictTerminator))
         self._mapdict_init_empty(w_subtype.terminator)