eliminate 'global const' from c_void_p_Type; nowadays we require Python 2.7+, so we can assume ctypes is available

Author: stevengj

src/conversions.jl

@@ -110,7 +110,7 @@ end
 #########################################################################
 # Pointer conversions, using ctypes or PyCapsule
 
-PyObject(p::Ptr) = py_void_p(p)
+PyObject(p::Ptr) = pycall(c_void_p_Type, PyObject, UInt(p))
 
 function convert(::Type{Ptr{Void}}, po::PyObject)
     if pyisinstance(po, c_void_p_Type)

src/pyinit.jl

@@ -15,6 +15,7 @@ const ufuncType = PyNULL()
 const format_traceback = PyNULL()
 const pyproperty = PyNULL()
 const jlfun2pyfun = PyNULL()
+const c_void_p_Type = PyNULL()
 
 # other global constants initialized at runtime are defined via Ref
 # or are simply left as non-const values
@@ -72,16 +73,8 @@ function __init__()
     # xrange type (or range in Python 3)
     pyxrange[] = @pyglobalobj(:PyRange_Type)
 
-    # cache ctypes.c_void_p type and function if available
-    vpt, pvp = try
-        (pyimport("ctypes")["c_void_p"],
-         p::Ptr -> pycall(c_void_p_Type, PyObject, UInt(p)))
-    catch # fallback to CObject
-        (@pyglobalobj(:PyCObject_FromVoidPtr),
-         p::Ptr -> PyObject(ccall(pycobject_new, PyPtr, (Ptr{Void}, Ptr{Void}), p, C_NULL)))
-    end
-    global const c_void_p_Type = vpt
-    global const py_void_p = pvp
+    # ctypes.c_void_p for Ptr types
+    copy!(c_void_p_Type, pyimport("ctypes")["c_void_p"])
 
     # traceback.format_tb function, for show(PyError)
     copy!(format_traceback, pyimport("traceback")["format_tb"])