Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modernize the codebase #204

Merged
merged 10 commits into from
Feb 4, 2020
Merged

Modernize the codebase #204

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9a7fcf1
move doc comments for extract! invocations
markbt Jan 28, 2020
16043db
allow deprecated use of get module filename and provide access to fil…
markbt Jan 28, 2020
a801f00
increase required version of Rust to 1.32
markbt Jan 28, 2020
bf41900
suppress deprecation warning for std::mem::uninitialized
markbt Jan 29, 2020
9d9a32b
use std::sync::Once::new()
markbt Jan 28, 2020
5d096c3
python27-sys: edition 2018
markbt Jan 28, 2020
458f555
python3-sys: edition 2018
markbt Jan 28, 2020
d1d93c2
cpython: edition 2018
markbt Jan 28, 2020
45fdacc
use edition 2018 style macro export and import
markbt Jan 28, 2020
a9e7e49
use paste to generate module init symbol names
markbt Jan 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/objects/module.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,24 @@ impl PyModule {
/// Gets the module filename.
///
/// May fail if the module does not have a `__file__` attribute.
#[allow(deprecated)]
gracinet marked this conversation as resolved.
Show resolved Hide resolved
pub fn filename<'a>(&'a self, py: Python) -> PyResult<&'a str> {
unsafe { self.str_from_ptr(py, ffi::PyModule_GetFilename(self.0.as_ptr())) }
}

/// Gets the module filename object.
///
/// May fail if the module does not have a `__file__` attribute.
#[cfg(feature = "python3-sys")]
pub fn filename_object<'a>(&'a self, py: Python) -> PyResult<PyObject> {
let ptr = unsafe { ffi::PyModule_GetFilenameObject(self.0.as_ptr()) };
if ptr.is_null() {
Err(PyErr::fetch(py))
} else {
Ok(unsafe { PyObject::from_borrowed_ptr(py, ptr) })
}
}

/// Gets a member from the module.
/// This is equivalent to the Python expression: `getattr(module, name)`
pub fn get(&self, py: Python, name: &str) -> PyResult<PyObject> {
Expand Down