Skip to content

feat(proxy): clone and reuse proxy objects #178

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

Merged
0x676e67 merged 1 commit into from
Apr 3, 2025
Merged

feat(proxy): clone and reuse proxy objects #178

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 5 additions & 12 deletions src/typing/proxy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ macro_rules! proxy_method {
/// Supports HTTP, HTTPS, SOCKS4, SOCKS4a, SOCKS5, and SOCKS5h protocols.
#[cfg_attr(feature = "docs", gen_stub_pyclass)]
#[pyclass]
pub struct Proxy(pub Option<rquest::Proxy>);
pub struct Proxy(pub rquest::Proxy);

proxy_method! {
{
Expand Down Expand Up @@ -173,7 +173,7 @@ impl Proxy {
proxy = proxy.no_proxy(rquest::NoProxy::from_string(exclusion))
}

Ok(Proxy(Some(proxy)))
Ok(Proxy(proxy))
}
}

Expand All @@ -182,13 +182,8 @@ pub struct ProxyExtractor(pub rquest::Proxy);
impl FromPyObject<'_> for ProxyExtractor {
fn extract_bound(ob: &Bound<'_, PyAny>) -> PyResult<Self> {
let proxy = ob.downcast::<Proxy>()?;
proxy
.borrow_mut()
.0
.take()
.map(ProxyExtractor)
.ok_or_else(|| Error::MemoryError)
.map_err(Into::into)
let proxy = proxy.borrow().0.clone();
Ok(Self(proxy))
}
}

Expand All @@ -201,9 +196,7 @@ impl FromPyObject<'_> for ProxyListExtractor {
.into_iter()
.try_fold(Vec::with_capacity(len), |mut list, proxy| {
let proxy = proxy.downcast::<Proxy>()?;
if let Some(proxy) = proxy.borrow_mut().0.take() {
list.push(proxy);
}
list.push(proxy.borrow().0.clone());
Ok::<_, PyErr>(list)
})
.map(Self)
Expand Down
Loading