Add PyArray_Type_Global

To adapt to PyO3 interface

Author: kngwyu

Cargo.toml

@@ -15,6 +15,5 @@ num-complex = "0.1"
 ndarray = "0.10"
 
 [dependencies.pyo3]
-git = "http://github.com/termoshtt/pyo3"
-branch = "pyobject_macros"
-version = "0.2"
+git = "https://github.com/PyO3/pyo3.git"
+rev = "c22bec6124ab68f47a7f28550931e3060f89071b"

src/array.rs

@@ -2,7 +2,6 @@
 
 use ndarray::*;
 use npyffi;
-use pyo3::ffi;
 use pyo3::*;
 
 use std::os::raw::c_void;
@@ -13,8 +12,7 @@ use super::*;
 
 /// Untyped safe interface for NumPy ndarray.
 pub struct PyArray(PyObject);
-
-pyobject_native_type!(PyArray, npyffi::PyArray_Type, npyffi::PyArray_Check);
+pyobject_native_type!(PyArray, npyffi::PyArray_Type_Global, npyffi::PyArray_Check);
 
 impl PyArray {
     pub fn as_array_ptr(&self) -> *mut npyffi::PyArrayObject {

src/npyffi/array.rs

@@ -25,6 +25,9 @@ pub struct PyArrayModule<'py> {
     api: *const *const c_void,
 }
 
+#[allow(non_upper_case_globals)]
+pub static mut PyArray_Type_Global: PyTypeObject = ffi::PyTypeObject_INIT;
+
 impl<'py> Deref for PyArrayModule<'py> {
     type Target = PyModule;
     fn deref(&self) -> &Self::Target {
@@ -50,10 +53,11 @@ impl<'py> PyArrayModule<'py> {
         let api = unsafe {
             ffi::PyCapsule_GetPointer(c_api.as_ptr(), null_mut()) as *const *const c_void
         };
-        Ok(Self {
-            numpy: numpy,
-            api: api,
-        })
+        let mod_ = PyArrayModule { numpy, api };
+        unsafe {
+            PyArray_Type_Global = *mod_.get_type_object(ArrayType::PyArray_Type);
+        }
+        Ok(mod_)
     }
 
     pyarray_api![0; PyArray_GetNDArrayCVersion() -> c_uint];
@@ -373,11 +377,13 @@ impl_array_type!(
 );
 
 #[allow(non_snake_case)]
-pub unsafe fn PyArray_Check(np: &PyArrayModule, op: *mut PyObject) -> c_int {
-    ffi::PyObject_TypeCheck(op, np.get_type_object(ArrayType::PyArray_Type))
+pub unsafe fn PyArray_Check(op: *mut PyObject) -> c_int {
+    let typeobj_ptr: *mut PyTypeObject = &mut PyArray_Type_Global;
+    ffi::PyObject_TypeCheck(op, typeobj_ptr)
 }
 
 #[allow(non_snake_case)]
-pub unsafe fn PyArray_CheckExact(np: &PyArrayModule, op: *mut PyObject) -> c_int {
-    (ffi::Py_TYPE(op) == np.get_type_object(ArrayType::PyArray_Type)) as c_int
+pub unsafe fn PyArray_CheckExact(op: *mut PyObject) -> c_int {
+    let typeobj_ptr: *mut _ = &mut PyArray_Type_Global;
+    (ffi::Py_TYPE(op) == typeobj_ptr) as c_int
 }