9
9
//! use numpy::random::{PyBitGenerator, PyBitGeneratorMethods as _};
10
10
//!
11
11
//! let mut bitgen = Python::with_gil(|py| -> PyResult<_> {
12
- //! let default_rng = py.import("numpy.random")?.getattr ("default_rng")?.call0( )?;
12
+ //! let default_rng = py.import("numpy.random")?.call_method0 ("default_rng")?;
13
13
//! let bit_generator = default_rng.getattr("bit_generator")?.downcast_into::<PyBitGenerator>()?;
14
14
//! bit_generator.lock()
15
15
//! })?;
@@ -83,17 +83,17 @@ impl<'py> PyBitGeneratorMethods for Bound<'py, PyBitGenerator> {
83
83
fn lock ( & self ) -> PyResult < PyBitGeneratorGuard > {
84
84
let capsule = self . getattr ( "capsule" ) ?. downcast_into :: < PyCapsule > ( ) ?;
85
85
let lock = self . getattr ( "lock" ) ?;
86
- if lock. getattr ( "locked" ) ? . call0 ( ) ?. extract ( ) ? {
86
+ if lock. call_method0 ( "locked" ) ?. extract ( ) ? {
87
87
return Err ( PyRuntimeError :: new_err ( "BitGenerator is already locked" ) ) ;
88
88
}
89
- lock. getattr ( "acquire" ) ? . call0 ( ) ?;
89
+ lock. call_method0 ( "acquire" ) ?;
90
90
91
91
assert_eq ! ( capsule. name( ) ?, Some ( c"BitGenerator" ) ) ;
92
92
let ptr = capsule. pointer ( ) as * mut npy_bitgen ;
93
93
let non_null = match NonNull :: new ( ptr) {
94
94
Some ( non_null) => non_null,
95
95
None => {
96
- lock. getattr ( "release" ) ? . call0 ( ) ?;
96
+ lock. call_method0 ( "release" ) ?;
97
97
return Err ( PyRuntimeError :: new_err ( "Invalid BitGenerator capsule" ) ) ;
98
98
}
99
99
} ;
@@ -153,7 +153,7 @@ impl PyBitGeneratorGuard {
153
153
impl Drop for PyBitGeneratorGuard {
154
154
fn drop ( & mut self ) {
155
155
let r = Python :: with_gil ( |py| -> PyResult < ( ) > {
156
- self . lock . bind ( py) . getattr ( "release" ) ? . call0 ( ) ?;
156
+ self . lock . bind ( py) . call_method0 ( "release" ) ?;
157
157
Ok ( ( ) )
158
158
} ) ;
159
159
if let Err ( e) = r {
@@ -180,7 +180,7 @@ mod tests {
180
180
use super :: * ;
181
181
182
182
fn get_bit_generator < ' py > ( py : Python < ' py > ) -> PyResult < Bound < ' py , PyBitGenerator > > {
183
- let default_rng = py. import ( "numpy.random" ) ?. getattr ( "default_rng" ) ? . call0 ( ) ?;
183
+ let default_rng = py. import ( "numpy.random" ) ?. call_method0 ( "default_rng" ) ?;
184
184
let bit_generator = default_rng
185
185
. getattr ( "bit_generator" ) ?
186
186
. downcast_into :: < PyBitGenerator > ( ) ?;
@@ -218,8 +218,7 @@ mod tests {
218
218
std:: mem:: drop ( bitgen) ;
219
219
assert ! ( !generator
220
220
. getattr( "lock" ) ?
221
- . getattr( "locked" ) ?
222
- . call0( ) ?
221
+ . call_method0( "locked" ) ?
223
222
. extract( ) ?) ;
224
223
Ok ( ( ) )
225
224
} )
0 commit comments