[pypy-svn] r79786 - pypy/branch/fast-forward/pypy/module/cpyext

[afa at codespeak.net]

Author: afa
Date: Fri Dec  3 17:58:57 2010
New Revision: 79786

Modified:
   pypy/branch/fast-forward/pypy/module/cpyext/cdatetime.py
   pypy/branch/fast-forward/pypy/module/cpyext/object.py
   pypy/branch/fast-forward/pypy/module/cpyext/unicodeobject.py
Log:
"error=nullptr" is now the default for pointer results


Modified: pypy/branch/fast-forward/pypy/module/cpyext/cdatetime.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/cpyext/cdatetime.py	(original)
+++ pypy/branch/fast-forward/pypy/module/cpyext/cdatetime.py	Fri Dec  3 17:58:57 2010
@@ -18,8 +18,7 @@
      ('DeltaType', PyTypeObjectPtr),
      ))
 
- at cpython_api([], lltype.Ptr(PyDateTime_CAPI),
-             error=lltype.nullptr(PyDateTime_CAPI))
+ at cpython_api([], lltype.Ptr(PyDateTime_CAPI))
 def _PyDateTime_Import(space):
     datetimeAPI = lltype.malloc(PyDateTime_CAPI, flavor='raw',
                                 track_allocation=False)

Modified: pypy/branch/fast-forward/pypy/module/cpyext/object.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/cpyext/object.py	(original)
+++ pypy/branch/fast-forward/pypy/module/cpyext/object.py	Fri Dec  3 17:58:57 2010
@@ -14,7 +14,7 @@
 import pypy.module.__builtin__.operation as operation
 
 
- at cpython_api([Py_ssize_t], rffi.VOIDP, error=lltype.nullptr(rffi.VOIDP.TO))
+ at cpython_api([Py_ssize_t], rffi.VOIDP)
 def PyObject_MALLOC(space, size):
     return lltype.malloc(rffi.VOIDP.TO, size,
                          flavor='raw', zero=True)

Modified: pypy/branch/fast-forward/pypy/module/cpyext/unicodeobject.py
==============================================================================
--- pypy/branch/fast-forward/pypy/module/cpyext/unicodeobject.py	(original)
+++ pypy/branch/fast-forward/pypy/module/cpyext/unicodeobject.py	Fri Dec  3 17:58:57 2010
@@ -122,7 +122,7 @@
         ref_unicode.c_buffer = rffi.unicode2wcharp(u)
     return ref_unicode.c_buffer
 
- at cpython_api([PyObject], rffi.CWCHARP, error=lltype.nullptr(rffi.CWCHARP.TO))
+ at cpython_api([PyObject], rffi.CWCHARP)
 def PyUnicode_AsUnicode(space, ref):
     """Return a read-only pointer to the Unicode object's internal Py_UNICODE
     buffer, NULL if unicode is not a Unicode object."""