Skip to content

Commit 997ceed

Browse files
birkenfeldbirkenfeld
committed
pyo3_path, part 1: mechanical replacement ::pyo3 -> _pyo3 
1 parent 770c02e commit 997ceed

File tree

10 files changed

+231
-231
lines changed

10 files changed

+231
-231
lines changed

‎pyo3-macros-backend/src/deprecations.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl ToTokens for Deprecations {
3333
let ident = deprecation.ident(*span);
3434
quote_spanned!(
3535
*span =>
36-
let _ = ::pyo3::impl_::deprecations::#ident;
36+
let _ = _pyo3::impl_::deprecations::#ident;
3737
)
3838
.to_tokens(tokens)
3939
}

‎pyo3-macros-backend/src/from_pyobject.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ impl<'a> Enum<'a> {
5555
for (i, var) in self.variants.iter().enumerate() {
5656
let struct_derive = var.build();
5757
let ext = quote!(
58-
let maybe_ret = || -> ::pyo3::PyResult<Self> {
58+
let maybe_ret = || -> _pyo3::PyResult<Self> {
5959
#struct_derive
6060
}();
6161

6262
match maybe_ret {
6363
ok @ ::std::result::Result::Ok(_) => return ok,
6464
::std::result::Result::Err(err) => {
65-
let py = ::pyo3::PyNativeType::py(obj);
65+
let py = _pyo3::PyNativeType::py(obj);
6666
err_reasons.push_str(&::std::format!("{}\n", err.value(py).str()?));
6767
}
6868
}
@@ -82,7 +82,7 @@ impl<'a> Enum<'a> {
8282
#ty_name,
8383
#error_names,
8484
&err_reasons);
85-
::std::result::Result::Err(::pyo3::exceptions::PyTypeError::new_err(err_msg))
85+
::std::result::Result::Err(_pyo3::exceptions::PyTypeError::new_err(err_msg))
8686
)
8787
}
8888
}
@@ -207,8 +207,8 @@ impl<'a> Container<'a> {
207207
);
208208
quote!(
209209
::std::result::Result::Ok(#self_ty{#ident: obj.extract().map_err(|inner| {
210-
let py = ::pyo3::PyNativeType::py(obj);
211-
let new_err = ::pyo3::exceptions::PyTypeError::new_err(#error_msg);
210+
let py = _pyo3::PyNativeType::py(obj);
211+
let new_err = _pyo3::exceptions::PyTypeError::new_err(#error_msg);
212212
new_err.set_cause(py, ::std::option::Option::Some(inner));
213213
new_err
214214
})?})
@@ -222,11 +222,11 @@ impl<'a> Container<'a> {
222222
};
223223
quote!(
224224
::std::result::Result::Ok(#self_ty(obj.extract().map_err(|err| {
225-
let py = ::pyo3::PyNativeType::py(obj);
225+
let py = _pyo3::PyNativeType::py(obj);
226226
let err_msg = ::std::format!("{}: {}",
227227
#error_msg,
228228
err.value(py).str().unwrap());
229-
::pyo3::exceptions::PyTypeError::new_err(err_msg)
229+
_pyo3::exceptions::PyTypeError::new_err(err_msg)
230230
})?))
231231
)
232232
}
@@ -238,9 +238,9 @@ impl<'a> Container<'a> {
238238
for i in 0..len {
239239
let error_msg = format!("failed to extract field {}.{}", quote!(#self_ty), i);
240240
fields.push(quote!(
241-
s.get_item(#i).and_then(::pyo3::types::PyAny::extract).map_err(|inner| {
242-
let py = ::pyo3::PyNativeType::py(obj);
243-
let new_err = ::pyo3::exceptions::PyTypeError::new_err(#error_msg);
241+
s.get_item(#i).and_then(_pyo3::types::PyAny::extract).map_err(|inner| {
242+
let py = _pyo3::PyNativeType::py(obj);
243+
let new_err = _pyo3::exceptions::PyTypeError::new_err(#error_msg);
244244
new_err.set_cause(py, ::std::option::Option::Some(inner));
245245
new_err
246246
})?));
@@ -255,9 +255,9 @@ impl<'a> Container<'a> {
255255
quote!("")
256256
};
257257
quote!(
258-
let s = <::pyo3::types::PyTuple as ::pyo3::conversion::PyTryFrom>::try_from(obj)?;
258+
let s = <_pyo3::types::PyTuple as _pyo3::conversion::PyTryFrom>::try_from(obj)?;
259259
if s.len() != #len {
260-
return ::std::result::Result::Err(::pyo3::exceptions::PyValueError::new_err(#msg))
260+
return ::std::result::Result::Err(_pyo3::exceptions::PyValueError::new_err(#msg))
261261
}
262262
::std::result::Result::Ok(#self_ty(#fields))
263263
)
@@ -279,15 +279,15 @@ impl<'a> Container<'a> {
279279
let extractor = match &attrs.from_py_with {
280280
None => quote!(
281281
#get_field.extract().map_err(|inner| {
282-
let py = ::pyo3::PyNativeType::py(obj);
283-
let new_err = ::pyo3::exceptions::PyTypeError::new_err(#conversion_error_msg);
282+
let py = _pyo3::PyNativeType::py(obj);
283+
let new_err = _pyo3::exceptions::PyTypeError::new_err(#conversion_error_msg);
284284
new_err.set_cause(py, ::std::option::Option::Some(inner));
285285
new_err
286286
})?),
287287
Some(FromPyWithAttribute(expr_path)) => quote! (
288288
#expr_path(#get_field).map_err(|inner| {
289-
let py = ::pyo3::PyNativeType::py(obj);
290-
let new_err = ::pyo3::exceptions::PyTypeError::new_err(#conversion_error_msg);
289+
let py = _pyo3::PyNativeType::py(obj);
290+
let new_err = _pyo3::exceptions::PyTypeError::new_err(#conversion_error_msg);
291291
new_err.set_cause(py, ::std::option::Option::Some(inner));
292292
new_err
293293
})?
@@ -521,8 +521,8 @@ pub fn build_derive_from_pyobject(tokens: &DeriveInput) -> Result<TokenStream> {
521521
let ident = &tokens.ident;
522522
Ok(quote!(
523523
#[automatically_derived]
524-
impl#trait_generics ::pyo3::FromPyObject<#lt_param> for #ident#generics #where_clause {
525-
fn extract(obj: &#lt_param ::pyo3::PyAny) -> ::pyo3::PyResult<Self> {
524+
impl#trait_generics _pyo3::FromPyObject<#lt_param> for #ident#generics #where_clause {
525+
fn extract(obj: &#lt_param _pyo3::PyAny) -> _pyo3::PyResult<Self> {
526526
#derives
527527
}
528528
}

‎pyo3-macros-backend/src/method.rs

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ impl FnType {
106106
}
107107
FnType::FnClass => {
108108
quote! {
109-
let _slf = ::pyo3::types::PyType::from_type_ptr(_py, _slf as *mut ::pyo3::ffi::PyTypeObject);
109+
let _slf = _pyo3::types::PyType::from_type_ptr(_py, _slf as *mut _pyo3::ffi::PyTypeObject);
110110
}
111111
}
112112
FnType::FnModule => {
113113
quote! {
114-
let _slf = _py.from_borrowed_ptr::<::pyo3::types::PyModule>(_slf);
114+
let _slf = _py.from_borrowed_ptr::<_pyo3::types::PyModule>(_slf);
115115
}
116116
}
117117
}
@@ -141,13 +141,13 @@ impl SelfType {
141141
pub fn receiver(&self, cls: &syn::Type, error_mode: ExtractErrorMode) -> TokenStream {
142142
let cell = match error_mode {
143143
ExtractErrorMode::Raise => {
144-
quote! { _py.from_borrowed_ptr::<::pyo3::PyAny>(_slf).downcast::<::pyo3::PyCell<#cls>>()? }
144+
quote! { _py.from_borrowed_ptr::<_pyo3::PyAny>(_slf).downcast::<_pyo3::PyCell<#cls>>()? }
145145
}
146146
ExtractErrorMode::NotImplemented => {
147147
quote! {
148-
match _py.from_borrowed_ptr::<::pyo3::PyAny>(_slf).downcast::<::pyo3::PyCell<#cls>>() {
148+
match _py.from_borrowed_ptr::<_pyo3::PyAny>(_slf).downcast::<_pyo3::PyCell<#cls>>() {
149149
::std::result::Result::Ok(cell) => cell,
150-
::std::result::Result::Err(_) => return ::pyo3::callback::convert(_py, _py.NotImplemented()),
150+
::std::result::Result::Err(_) => return _pyo3::callback::convert(_py, _py.NotImplemented()),
151151
}
152152
}
153153
}
@@ -471,17 +471,17 @@ impl<'a> FnSpec<'a> {
471471
quote!(#func_name)
472472
};
473473
let rust_call =
474-
quote! { ::pyo3::callback::convert(#py, #rust_name(#self_arg #(#arg_names),*)) };
474+
quote! { _pyo3::callback::convert(#py, #rust_name(#self_arg #(#arg_names),*)) };
475475
Ok(match self.convention {
476476
CallingConvention::Noargs => {
477477
quote! {
478478
unsafe extern "C" fn #ident (
479-
_slf: *mut ::pyo3::ffi::PyObject,
480-
_args: *mut ::pyo3::ffi::PyObject,
481-
) -> *mut ::pyo3::ffi::PyObject
479+
_slf: *mut _pyo3::ffi::PyObject,
480+
_args: *mut _pyo3::ffi::PyObject,
481+
) -> *mut _pyo3::ffi::PyObject
482482
{
483483
#deprecations
484-
::pyo3::callback::handle_panic(|#py| {
484+
_pyo3::callback::handle_panic(|#py| {
485485
#self_conversion
486486
#rust_call
487487
})
@@ -492,17 +492,17 @@ impl<'a> FnSpec<'a> {
492492
let arg_convert_and_rust_call = impl_arg_params(self, cls, rust_call, &py, true)?;
493493
quote! {
494494
unsafe extern "C" fn #ident (
495-
_slf: *mut ::pyo3::ffi::PyObject,
496-
_args: *const *mut ::pyo3::ffi::PyObject,
497-
_nargs: ::pyo3::ffi::Py_ssize_t,
498-
_kwnames: *mut ::pyo3::ffi::PyObject) -> *mut ::pyo3::ffi::PyObject
495+
_slf: *mut _pyo3::ffi::PyObject,
496+
_args: *const *mut _pyo3::ffi::PyObject,
497+
_nargs: _pyo3::ffi::Py_ssize_t,
498+
_kwnames: *mut _pyo3::ffi::PyObject) -> *mut _pyo3::ffi::PyObject
499499
{
500500
#deprecations
501-
::pyo3::callback::handle_panic(|#py| {
501+
_pyo3::callback::handle_panic(|#py| {
502502
#self_conversion
503-
let _kwnames: ::std::option::Option<&::pyo3::types::PyTuple> = #py.from_borrowed_ptr_or_opt(_kwnames);
503+
let _kwnames: ::std::option::Option<&_pyo3::types::PyTuple> = #py.from_borrowed_ptr_or_opt(_kwnames);
504504
// Safety: &PyAny has the same memory layout as `*mut ffi::PyObject`
505-
let _args = _args as *const &::pyo3::PyAny;
505+
let _args = _args as *const &_pyo3::PyAny;
506506
let _kwargs = if let ::std::option::Option::Some(kwnames) = _kwnames {
507507
::std::slice::from_raw_parts(_args.offset(_nargs), kwnames.len())
508508
} else {
@@ -519,15 +519,15 @@ impl<'a> FnSpec<'a> {
519519
let arg_convert_and_rust_call = impl_arg_params(self, cls, rust_call, &py, false)?;
520520
quote! {
521521
unsafe extern "C" fn #ident (
522-
_slf: *mut ::pyo3::ffi::PyObject,
523-
_args: *mut ::pyo3::ffi::PyObject,
524-
_kwargs: *mut ::pyo3::ffi::PyObject) -> *mut ::pyo3::ffi::PyObject
522+
_slf: *mut _pyo3::ffi::PyObject,
523+
_args: *mut _pyo3::ffi::PyObject,
524+
_kwargs: *mut _pyo3::ffi::PyObject) -> *mut _pyo3::ffi::PyObject
525525
{
526526
#deprecations
527-
::pyo3::callback::handle_panic(|#py| {
527+
_pyo3::callback::handle_panic(|#py| {
528528
#self_conversion
529-
let _args = #py.from_borrowed_ptr::<::pyo3::types::PyTuple>(_args);
530-
let _kwargs: ::std::option::Option<&::pyo3::types::PyDict> = #py.from_borrowed_ptr_or_opt(_kwargs);
529+
let _args = #py.from_borrowed_ptr::<_pyo3::types::PyTuple>(_args);
530+
let _kwargs: ::std::option::Option<&_pyo3::types::PyDict> = #py.from_borrowed_ptr_or_opt(_kwargs);
531531

532532
#arg_convert_and_rust_call
533533
})
@@ -539,20 +539,20 @@ impl<'a> FnSpec<'a> {
539539
let arg_convert_and_rust_call = impl_arg_params(self, cls, rust_call, &py, false)?;
540540
quote! {
541541
unsafe extern "C" fn #ident (
542-
subtype: *mut ::pyo3::ffi::PyTypeObject,
543-
_args: *mut ::pyo3::ffi::PyObject,
544-
_kwargs: *mut ::pyo3::ffi::PyObject) -> *mut ::pyo3::ffi::PyObject
542+
subtype: *mut _pyo3::ffi::PyTypeObject,
543+
_args: *mut _pyo3::ffi::PyObject,
544+
_kwargs: *mut _pyo3::ffi::PyObject) -> *mut _pyo3::ffi::PyObject
545545
{
546546
#deprecations
547-
use ::pyo3::callback::IntoPyCallbackOutput;
548-
::pyo3::callback::handle_panic(|#py| {
549-
let _args = #py.from_borrowed_ptr::<::pyo3::types::PyTuple>(_args);
550-
let _kwargs: ::std::option::Option<&::pyo3::types::PyDict> = #py.from_borrowed_ptr_or_opt(_kwargs);
547+
use _pyo3::callback::IntoPyCallbackOutput;
548+
_pyo3::callback::handle_panic(|#py| {
549+
let _args = #py.from_borrowed_ptr::<_pyo3::types::PyTuple>(_args);
550+
let _kwargs: ::std::option::Option<&_pyo3::types::PyDict> = #py.from_borrowed_ptr_or_opt(_kwargs);
551551

552552
let result = #arg_convert_and_rust_call;
553-
let initializer: ::pyo3::PyClassInitializer::<#cls> = result.convert(#py)?;
553+
let initializer: _pyo3::PyClassInitializer::<#cls> = result.convert(#py)?;
554554
let cell = initializer.create_cell_from_subtype(#py, subtype)?;
555-
::std::result::Result::Ok(cell as *mut ::pyo3::ffi::PyObject)
555+
::std::result::Result::Ok(cell as *mut _pyo3::ffi::PyObject)
556556
})
557557
}
558558
}
@@ -567,23 +567,23 @@ impl<'a> FnSpec<'a> {
567567
let doc = &self.doc;
568568
match self.convention {
569569
CallingConvention::Noargs => quote! {
570-
::pyo3::class::methods::PyMethodDef::noargs(
570+
_pyo3::class::methods::PyMethodDef::noargs(
571571
#python_name,
572-
::pyo3::class::methods::PyCFunction(#wrapper),
572+
_pyo3::class::methods::PyCFunction(#wrapper),
573573
#doc,
574574
)
575575
},
576576
CallingConvention::Fastcall => quote! {
577-
::pyo3::class::methods::PyMethodDef::fastcall_cfunction_with_keywords(
577+
_pyo3::class::methods::PyMethodDef::fastcall_cfunction_with_keywords(
578578
#python_name,
579-
::pyo3::class::methods::PyCFunctionFastWithKeywords(#wrapper),
579+
_pyo3::class::methods::PyCFunctionFastWithKeywords(#wrapper),
580580
#doc,
581581
)
582582
},
583583
CallingConvention::Varargs => quote! {
584-
::pyo3::class::methods::PyMethodDef::cfunction_with_keywords(
584+
_pyo3::class::methods::PyMethodDef::cfunction_with_keywords(
585585
#python_name,
586-
::pyo3::class::methods::PyCFunctionWithKeywords(#wrapper),
586+
_pyo3::class::methods::PyCFunctionWithKeywords(#wrapper),
587587
#doc,
588588
)
589589
},

‎pyo3-macros-backend/src/module.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ pub fn py_init(fnname: &Ident, options: PyModuleOptions, doc: PythonDoc) -> Toke
5555
#[allow(non_snake_case)]
5656
/// This autogenerated function is called by the python interpreter when importing
5757
/// the module.
58-
pub unsafe extern "C" fn #cb_name() -> *mut ::pyo3::ffi::PyObject {
59-
use ::pyo3::derive_utils::ModuleDef;
58+
pub unsafe extern "C" fn #cb_name() -> *mut _pyo3::ffi::PyObject {
59+
use _pyo3::derive_utils::ModuleDef;
6060
static NAME: &str = concat!(stringify!(#name), "\0");
6161
static DOC: &str = #doc;
6262
static MODULE_DEF: ModuleDef = unsafe { ModuleDef::new(NAME, DOC) };
6363

64-
::pyo3::callback::handle_panic(|_py| { MODULE_DEF.make_module(_py, #fnname) })
64+
_pyo3::callback::handle_panic(|_py| { MODULE_DEF.make_module(_py, #fnname) })
6565
}
6666
}
6767
}

‎pyo3-macros-backend/src/params.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ pub fn impl_arg_params(
9393

9494
if kwonly {
9595
keyword_only_parameters.push(quote! {
96-
::pyo3::derive_utils::KeywordOnlyParameterDescription {
96+
_pyo3::derive_utils::KeywordOnlyParameterDescription {
9797
name: #name,
9898
required: #required,
9999
}
@@ -128,7 +128,7 @@ pub fn impl_arg_params(
128128
let (accept_args, accept_kwargs) = accept_args_kwargs(&spec.attrs);
129129

130130
let cls_name = if let Some(cls) = self_ {
131-
quote! { ::std::option::Option::Some(<#cls as ::pyo3::type_object::PyTypeInfo>::NAME) }
131+
quote! { ::std::option::Option::Some(<#cls as _pyo3::type_object::PyTypeInfo>::NAME) }
132132
} else {
133133
quote! { ::std::option::Option::None }
134134
};
@@ -155,7 +155,7 @@ pub fn impl_arg_params(
155155

156156
// create array of arguments, and then parse
157157
Ok(quote! {{
158-
const DESCRIPTION: ::pyo3::derive_utils::FunctionDescription = ::pyo3::derive_utils::FunctionDescription {
158+
const DESCRIPTION: _pyo3::derive_utils::FunctionDescription = _pyo3::derive_utils::FunctionDescription {
159159
cls_name: #cls_name,
160160
func_name: stringify!(#python_name),
161161
positional_parameter_names: &[#(#positional_parameter_names),*],
@@ -206,7 +206,7 @@ fn impl_arg_param(
206206
let ty = arg.ty;
207207
let name = arg.name;
208208
let transform_error = quote! {
209-
|e| ::pyo3::derive_utils::argument_extraction_error(#py, stringify!(#name), e)
209+
|e| _pyo3::derive_utils::argument_extraction_error(#py, stringify!(#name), e)
210210
};
211211

212212
if is_args(&spec.attrs, name) {
@@ -275,7 +275,7 @@ fn impl_arg_param(
275275
let (target_ty, borrow_tmp) = if arg.optional.is_some() {
276276
// Get Option<&T> from Option<PyRef<T>>
277277
(
278-
quote_arg_span! { ::std::option::Option<<#tref as ::pyo3::derive_utils::ExtractExt<'_>>::Target> },
278+
quote_arg_span! { ::std::option::Option<<#tref as _pyo3::derive_utils::ExtractExt<'_>>::Target> },
279279
if mut_.is_some() {
280280
quote_arg_span! { _tmp.as_deref_mut() }
281281
} else {
@@ -285,7 +285,7 @@ fn impl_arg_param(
285285
} else {
286286
// Get &T from PyRef<T>
287287
(
288-
quote_arg_span! { <#tref as ::pyo3::derive_utils::ExtractExt<'_>>::Target },
288+
quote_arg_span! { <#tref as _pyo3::derive_utils::ExtractExt<'_>>::Target },
289289
quote_arg_span! { &#mut_ *_tmp },
290290
)
291291
};

0 commit comments

Comments
 (0)