luxolus
/
pyo3
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix imports

This commit is contained in:
Nikolay Kim 2017-06-23 11:24:17 -07:00
parent 289e5e0a2f
commit 6482245038
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pyo3cls/src/module.rs
View File

@ -43,30 +43,30 @@ pub fn py3_init(fnname: &syn::Ident, name: &String, doc: syn::Lit) -> Tokens {
#[no_mangle] #[no_mangle]
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub unsafe extern "C" fn #cb_name() -> *mut ::pyo3::ffi::PyObject { pub unsafe extern "C" fn #cb_name() -> *mut ::pyo3::ffi::PyObject {
extern crate pyo3;
use std; use std;
extern crate pyo3 as _pyo3;
use pyo3::{IntoPyPointer, ObjectProtocol}; use pyo3::{IntoPyPointer, ObjectProtocol};
// initialize python // initialize python
pyo3::pythonrun::prepare_freethreaded_python(); pyo3::prepare_freethreaded_python();
static mut MODULE_DEF: _pyo3::ffi::PyModuleDef = _pyo3::ffi::PyModuleDef_INIT; static mut MODULE_DEF: pyo3::ffi::PyModuleDef = pyo3::ffi::PyModuleDef_INIT;
// We can't convert &'static str to *const c_char within a static initializer, // We can't convert &'static str to *const c_char within a static initializer,
// so we'll do it here in the module initialization: // so we'll do it here in the module initialization:
MODULE_DEF.m_name = concat!(stringify!(#cb_name), "\0").as_ptr() as *const _; MODULE_DEF.m_name = concat!(stringify!(#cb_name), "\0").as_ptr() as *const _;
_pyo3::callback::cb_meth("py_module_init", |py| { pyo3::callback::cb_meth("py_module_init", |py| {
_pyo3::ffi::PyEval_InitThreads(); pyo3::ffi::PyEval_InitThreads();
let module = _pyo3::ffi::PyModule_Create(&mut MODULE_DEF); let module = pyo3::ffi::PyModule_Create(&mut MODULE_DEF);
if module.is_null() { if module.is_null() {
return module; return module;
} }
let module = match py.cast_from_ptr_or_err::<_pyo3::PyModule>(module) { let module = match py.cast_from_ptr_or_err::<pyo3::PyModule>(module) {
Ok(m) => m, Ok(m) => m,
Err(e) => { Err(e) => {
_pyo3::PyErr::from(e).restore(py); pyo3::PyErr::from(e).restore(py);
return std::ptr::null_mut(); return std::ptr::null_mut();
} }
}; };
@ -118,15 +118,14 @@ pub fn py2_init(fnname: &syn::Ident, name: &String, doc: syn::Lit) -> Tokens {
#[no_mangle] #[no_mangle]
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub unsafe extern "C" fn #cb_name() { pub unsafe extern "C" fn #cb_name() {
extern crate pyo3 as _pyo3; extern crate pyo3;
use std; use std;
use pyo3::pythonrun;
// initialize python // initialize python
pyo3::pythonrun::prepare_freethreaded_python(); pyo3::prepare_freethreaded_python();
let name = concat!(stringify!(#cb_name), "\0").as_ptr() as *const _; let name = concat!(stringify!(#cb_name), "\0").as_ptr() as *const _;
let guard = _pyo3::callback::AbortOnDrop("py_module_initializer"); let guard = pyo3::callback::AbortOnDrop("py_module_initializer");
let py = pyo3::Python::assume_gil_acquired(); let py = pyo3::Python::assume_gil_acquired();
pyo3::ffi::PyEval_InitThreads(); pyo3::ffi::PyEval_InitThreads();
let module = pyo3::ffi::Py_InitModule(name, std::ptr::null_mut()); let module = pyo3::ffi::Py_InitModule(name, std::ptr::null_mut());
@ -135,10 +134,10 @@ pub fn py2_init(fnname: &syn::Ident, name: &String, doc: syn::Lit) -> Tokens {
return return
} }
let module = match py.cast_from_ptr_or_err::<_pyo3::PyModule>(module) { let module = match py.cast_from_ptr_or_err::<pyo3::PyModule>(module) {
Ok(m) => m, Ok(m) => m,
Err(e) => { Err(e) => {
_pyo3::PyErr::from(e).restore(py); pyo3::PyErr::from(e).restore(py);
std::mem::forget(guard); std::mem::forget(guard);
return return
} }