Merge lp:~ai-2/ijson/ptr-trunc into lp:~isagalaev/ijson/trunk

[a]

one change:

http://bazaar.launchpad.net/~ai/ijson/ptr-trunc/revision/23

was getting segfaults in yajl on x86_64. i think the ctype.cdll assumes int (32-bit?) return type and so pointer to yajl_handle were being truncated.

tests.py passes fedora 13 x86_64 w/python 2.6.

[Ivan Sagalaev (isagalaev)]

We didn't get this error on 64-bit Ubuntu 8.04 so I suppose this may depend on the version of ctypes or python. But the change makes it more explicit anyway. Merged it in, thanks!

=== modified file 'ijson/lib.py'
--- ijson/lib.py	2010-08-26 09:21:54 +0000
+++ ijson/lib.py	2010-12-01 11:48:44 +0000
@@ -1,6 +1,10 @@
-from ctypes import cdll, util
+from ctypes import cdll, util, c_char, POINTER
 
 name = util.find_library('yajl')
 if name is None:
     raise Exception('YAJL shared object not found.')
 yajl = cdll.LoadLibrary(name)
+
+yajl.yajl_alloc.restype = POINTER(c_char)
+yajl.yajl_gen_alloc.restype = POINTER(c_char)
+yajl.yajl_gen_alloc2.restype = POINTER(c_char)