Update to pyo3 0.5.0 alpha2

Author: kngwyu

Cargo.toml

@@ -15,4 +15,4 @@ libc = "0.2"
 num-complex = "0.2"
 num-traits = "0.2.6"
 ndarray = "0.12"
-pyo3 = "0.4.1"
+pyo3 = "0.5.0-alpha.2"

README.md

@@ -38,15 +38,16 @@ Example
 name = "numpy-test"
 
 [dependencies]
-pyo3 = "^0.4.1"
+pyo3 = "^0.5.0-alpha.2"
 numpy = "0.3"
 ```
 
 ``` rust
 extern crate numpy;
 extern crate pyo3;
 use numpy::{PyArray1, get_array_module};
-use pyo3::prelude::{ObjectProtocol, PyDict, PyResult, Python};
+use pyo3::prelude::{ObjectProtocol, PyResult, Python};
+use pyo3::types::PyDict;
 
 fn main() -> Result<(), ()> {
     let gil = Python::acquire_gil();
@@ -85,7 +86,7 @@ numpy = "0.3"
 ndarray = "0.12"
 
 [dependencies.pyo3]
-version = "^0.4.1"
+version = "^0.5.0-alpha.2"
 features = ["extension-module"]
 ```
 

example/extensions/Cargo.toml

@@ -12,5 +12,5 @@ numpy = { path = "../.." }
 ndarray = "0.12"
 
 [dependencies.pyo3]
-version = "0.4.1"
+version = "0.5.0-alpha.2"
 features = ["extension-module"]

src/array.rs

@@ -2,7 +2,8 @@
 use ndarray::*;
 use npyffi::{self, npy_intp, NPY_ORDER, PY_ARRAY_API};
 use num_traits::AsPrimitive;
-use pyo3::*;
+use pyo3::{exceptions::TypeError, ffi, prelude::*, types::PyObjectRef};
+use pyo3::{PyDowncastError, PyObjectWithToken, ToPyPointer};
 use std::iter::ExactSizeIterator;
 use std::marker::PhantomData;
 use std::mem;
@@ -123,7 +124,7 @@ impl<'a, T: TypeNum, D: Dimension> FromPyObject<'a> for &'a PyArray<T, D> {
             if let Some(ndim) = D::NDIM {
                 let ptr = ob.as_ptr() as *mut npyffi::PyArrayObject;
                 if (*ptr).nd as usize != ndim {
-                    return Err(PyErr::new::<exc::TypeError, _>(format!(
+                    return Err(PyErr::new::<TypeError, _>(format!(
                         "specified dim was {}, but actual dim was {}",
                         ndim,
                         (*ptr).nd

src/error.rs

@@ -2,7 +2,7 @@
 
 use array::PyArray;
 use convert::ToNpyDims;
-use pyo3::*;
+use pyo3::{exceptions as exc, PyErr, PyResult};
 use std::error;
 use std::fmt;
 use types::{NpyDataType, TypeNum};

src/lib.rs

@@ -38,6 +38,7 @@ extern crate libc;
 extern crate ndarray;
 extern crate num_complex;
 extern crate num_traits;
+#[macro_use]
 extern crate pyo3;
 
 pub mod array;

src/slice_box.rs

@@ -1,5 +1,5 @@
 use crate::types::TypeNum;
-use pyo3::{self, ffi, typeob, PyObjectAlloc, Python, ToPyPointer};
+use pyo3::{ffi, typeob, types::PyObjectRef, PyObjectAlloc, Python, ToPyPointer};
 use std::os::raw::c_void;
 
 #[repr(C)]
@@ -26,7 +26,7 @@ impl<T> SliceBox<T> {
 
 impl<T> typeob::PyTypeInfo for SliceBox<T> {
     type Type = ();
-    type BaseType = pyo3::PyObjectRef;
+    type BaseType = PyObjectRef;
     const NAME: &'static str = "SliceBox";
     const DESCRIPTION: &'static str = "Memory store for PyArray made by IntoPyArray.";
     const FLAGS: usize = 0;
@@ -39,7 +39,7 @@ impl<T> typeob::PyTypeInfo for SliceBox<T> {
     }
 }
 
-impl<T: TypeNum> typeob::PyTypeObject for SliceBox<T> {
+impl<T: TypeNum> typeob::PyTypeCreate for SliceBox<T> {
     #[inline(always)]
     fn init_type() {
         static START: std::sync::Once = std::sync::ONCE_INIT;

tests/array.rs

@@ -4,7 +4,7 @@ extern crate pyo3;
 
 use ndarray::*;
 use numpy::*;
-use pyo3::prelude::*;
+use pyo3::{prelude::*, types::PyDict, types::PyList};
 
 #[test]
 fn new_c_order() {
@@ -124,7 +124,7 @@ fn is_instance() {
     let py = gil.python();
     let arr = PyArray2::<f64>::new(gil.python(), [3, 5], false);
     assert!(py.is_instance::<PyArray2<f64>, _>(arr).unwrap());
-    assert!(!py.is_instance::<pyo3::PyList, _>(arr).unwrap());
+    assert!(!py.is_instance::<PyList, _>(arr).unwrap());
 }
 
 #[test]