rename pointer mod to object

This commit is contained in:
Nikolay Kim 2017-07-13 13:05:50 -07:00
parent 27f8747ba6
commit ed31492d36
24 changed files with 25 additions and 25 deletions

View File

@ -4,7 +4,7 @@
use ffi;
use err::PyResult;
use python::{Python, ToPyPointer, PyDowncastFrom};
use pointer::PyObject;
use object::PyObject;
use objects::{PyObjectRef, PyTuple};
use objectprotocol::ObjectProtocol;
use typeob::PyTypeInfo;

View File

@ -7,7 +7,7 @@ use std::marker::PhantomData;
use ffi;
use pythonrun;
use err::{PyResult, PyErr, PyDowncastError};
use pointer::PyObject;
use object::PyObject;
use objects::PyObjectRef;
use objectprotocol::ObjectProtocol;
use conversion::{ToPyObject, IntoPyObject, FromPyObject};

View File

@ -156,7 +156,7 @@ pub mod ffi {
pub use err::{PyErr, PyResult, PyDowncastError, ToPyErr};
pub use objects::*;
pub use objectprotocol::ObjectProtocol;
pub use pointer::PyObject;
pub use object::PyObject;
pub use python::{Python, ToPyPointer, IntoPyPointer, PyClone,
PyMutDowncastFrom, PyDowncastFrom, PyDowncastInto};
pub use pythonrun::{GILGuard, prepare_freethreaded_python, prepare_pyo3_library};
@ -190,9 +190,9 @@ mod python;
mod err;
mod conversion;
mod instance;
mod object;
mod objects;
mod objectprotocol;
mod pointer;
mod pythonrun;
pub mod callback;
pub mod typeob;

View File

@ -7,7 +7,7 @@ use std::os::raw::c_int;
use ffi;
use err::{PyErr, PyResult, PyDowncastError, self};
use python::{Python, ToPyPointer, PyDowncastFrom, PyClone};
use pointer::PyObject;
use object::PyObject;
use objects::{PyObjectRef, PyDict, PyString, PyIterator, PyType};
use conversion::{ToPyObject, IntoPyTuple, FromPyObject};
use instance::PyObjectWithToken;

View File

@ -1,6 +1,6 @@
// Copyright (c) 2017-present PyO3 Project and Contributors
use ffi;
use pointer::PyObject;
use object::PyObject;
use python::{ToPyPointer, Python};
use conversion::{ToPyObject, IntoPyObject};

View File

@ -3,7 +3,7 @@
use std;
use std::os::raw::c_char;
use ffi;
use pointer::PyObject;
use object::PyObject;
use instance::PyObjectWithToken;
use python::{Python, ToPyPointer};
use err::{PyResult, PyErr};
@ -75,7 +75,7 @@ impl PyByteArray {
mod test {
use exc;
use python::Python;
use pointer::PyObject;
use object::PyObject;
use objects::PyByteArray;
#[test]

View File

@ -5,7 +5,7 @@
use std::{mem, collections, hash, cmp};
use ffi;
use pointer::PyObject;
use object::PyObject;
use instance::PyObjectWithToken;
use python::{Python, ToPyPointer};
use conversion::ToPyObject;

View File

@ -9,7 +9,7 @@ use std::{self, mem, ops};
use std::ffi::CStr;
use ffi;
use pointer::PyObject;
use object::PyObject;
use python::{Python, ToPyPointer};
use err::PyResult;
use super::{PyTuple, PyType};

View File

@ -5,7 +5,7 @@
use std::os::raw::c_double;
use ffi;
use pointer::PyObject;
use object::PyObject;
use python::{ToPyPointer, Python};
use err::PyErr;
use instance::{Py, PyObjectWithToken};

View File

@ -5,7 +5,7 @@
use err::{self, PyResult};
use ffi::{self, Py_ssize_t};
use instance::PyObjectWithToken;
use pointer::PyObject;
use object::PyObject;
use objects::PyObjectRef;
use python::{Python, ToPyPointer, IntoPyPointer};
use conversion::{ToPyObject, IntoPyObject};

View File

@ -8,7 +8,7 @@ use std::os::raw::c_char;
use std::ffi::{CStr, CString};
use conversion::{ToPyObject, IntoPyTuple};
use pointer::PyObject;
use object::PyObject;
use python::{Python, ToPyPointer};
use objects::{PyObjectRef, PyDict, PyType, exc};
use objectprotocol::ObjectProtocol;

View File

@ -8,7 +8,7 @@ extern crate num_traits;
use self::num_traits::cast::cast;
use ffi;
use pointer::PyObject;
use object::PyObject;
use python::{ToPyPointer, IntoPyPointer, Python};
use err::{PyResult, PyErr};
use instance::{Py, PyObjectWithToken};

View File

@ -8,7 +8,7 @@ extern crate num_traits;
use self::num_traits::cast::cast;
use ffi;
use pointer::PyObject;
use object::PyObject;
use python::{ToPyPointer, Python};
use err::{PyResult, PyErr};
use objects::{exc, PyObjectRef};

View File

@ -3,7 +3,7 @@
// based on Daniel Grunwald's https://github.com/dgrunwald/rust-cpython
use ffi;
use pointer::PyObject;
use object::PyObject;
use instance::PyObjectWithToken;
use python::{Python, ToPyPointer, PyDowncastFrom};
use conversion::{FromPyObject, ToPyObject};

View File

@ -4,7 +4,7 @@
use std::{hash, collections};
use ffi;
use python::{Python, ToPyPointer};
use pointer::PyObject;
use object::PyObject;
use conversion::ToPyObject;
use instance::{AsPyRef, Py, PyObjectWithToken};
use err::{self, PyResult, PyErr};

View File

@ -2,7 +2,7 @@
use std::os::raw::c_long;
use pointer::PyObject;
use object::PyObject;
use python::{ToPyPointer, Python};
use err::{PyErr, PyResult};
use ffi::{self, Py_ssize_t};

View File

@ -9,7 +9,7 @@ use std::os::raw::c_char;
use ffi;
use instance::{Py, PyObjectWithToken};
use pointer::PyObject;
use object::PyObject;
use objects::PyObjectRef;
use python::{ToPyPointer, Python};
use err::{PyResult, PyErr};

View File

@ -10,7 +10,7 @@ use std::os::raw::c_char;
use ffi;
use err::PyResult;
use pointer::PyObject;
use object::PyObject;
use instance::{Py, PyObjectWithToken};
use python::{Python, ToPyPointer};
use objectprotocol::ObjectProtocol;

View File

@ -2,7 +2,7 @@
use std::borrow::Cow;
use err::PyResult;
use pointer::PyObject;
use object::PyObject;
use objects::{PyObjectRef, PyString};
use objectprotocol::ObjectProtocol;
use python::Python;

View File

@ -7,7 +7,7 @@ use std::slice;
use ffi::{self, Py_ssize_t};
use err::{PyErr, PyResult};
use instance::{Py, PyObjectWithToken};
use pointer::PyObject;
use object::PyObject;
use objects::PyObjectRef;
use objectprotocol::ObjectProtocol;
use python::{Python, ToPyPointer, IntoPyPointer};

View File

@ -6,7 +6,7 @@ use std::ffi::CStr;
use std::borrow::Cow;
use ffi;
use pointer::PyObject;
use object::PyObject;
use python::{Python, ToPyPointer};
use err::{PyErr, PyResult};
use instance::PyObjectWithToken;

View File

@ -10,7 +10,7 @@ use std::os::raw::c_int;
use ffi;
use typeob::{PyTypeInfo, PyTypeObject, PyObjectAlloc};
use instance::{Py, PyToken};
use pointer::PyObject;
use object::PyObject;
use objects::{PyObjectRef, PyType, PyDict, PyModule};
use err::{PyErr, PyResult, PyDowncastError, ToPyErr};
use pythonrun::{self, GILGuard};

View File

@ -258,7 +258,7 @@ mod test {
use std;
use {ffi, pythonrun};
use python::Python;
use pointer::PyObject;
use object::PyObject;
use super::{Pool, Pointers, POINTERS};
#[test]