[pypy-commit] pypy py3k: merge default

pjenvey noreply at buildbot.pypy.org
Tue Nov 8 02:55:41 CET 2011

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r48895:3a5b3b4bda7a
Date: 2011-11-07 17:54 -0800

Log:	merge default

diff --git a/lib_pypy/_ctypes/pointer.py b/lib_pypy/_ctypes/pointer.py
--- a/lib_pypy/_ctypes/pointer.py
+++ b/lib_pypy/_ctypes/pointer.py
@@ -124,7 +124,8 @@
     # for now, we always allow types.pointer, else a lot of tests
     # break. We need to rethink how pointers are represented, though
     if my_ffitype is not ffitype and ffitype is not _ffi.types.void_p:
-        raise ArgumentError, "expected %s instance, got %s" % (type(value), ffitype)
+        raise ArgumentError("expected %s instance, got %s" % (type(value),
+                                                              ffitype))
     return value._get_buffer_value()
 def _cast_addr(obj, _, tp):

More information about the pypy-commit mailing list