Skip to content

Cleanup some direct magic method definitions #7441

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
youknowone merged 5 commits into from
Mar 16, 2026
Merged

Cleanup some direct magic method definitions #7441

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ef8c6f
Migrate direct __repr__ definitions to Representable trait
moreal Mar 16, 2026
4bbd54c
Migrate direct __del__ definition to Destructor trait for PySocket
moreal Mar 16, 2026
ecf9e21
Remove redundant __iter__ pymethods from PyFuture and PyTask
moreal Mar 16, 2026
20ddf9c
Enable derive guards for __get__/__set__/__delete__ descriptor methods
moreal Mar 16, 2026
8791e15
Enable derive guards for AsMapping/AsSequence slot methods
moreal Mar 16, 2026
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
Prev Previous commit
Next Next commit
Migrate direct __del__ definition to Destructor trait for PySocket 
Move #[pymethod] __del__ to impl Destructor for PySocket.
Preserves ResourceWarning emission and close behavior.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
  • Loading branch information
@moreal @claude
moreal and claude committed Mar 16, 2026
commit 4bbd54c3c107abd79ebec6e3d586309be2e0cc41
73 changes: 39 additions & 34 deletions crates/stdlib/src/socket.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ mod _socket {
ArgBytesLike, ArgIntoFloat, ArgMemoryBuffer, ArgStrOrBytesLike, Either, FsPath,
OptionalArg, OptionalOption,
},
types::{Constructor, DefaultConstructor, Initializer, Representable},
types::{Constructor, DefaultConstructor, Destructor, Initializer, Representable},
utils::ToCString,
};

Expand Down Expand Up @@ -1417,7 +1417,44 @@ mod _socket {
}
}

#[pyclass(with(Constructor, Initializer, Representable), flags(BASETYPE))]
impl Destructor for PySocket {
fn del(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<()> {
// Emit ResourceWarning if socket is still open
if zelf.sock.read().is_some() {
let laddr = if let Ok(sock) = zelf.sock()
&& let Ok(addr) = sock.local_addr()
&& let Ok(repr) = get_addr_tuple(&addr, vm).repr(vm)
{
format!(", laddr={}", repr.as_wtf8())
} else {
String::new()
};

let msg = format!(
"unclosed <socket.socket fd={}, family={}, type={}, proto={}{}>",
zelf.fileno(),
zelf.family.load(),
zelf.kind.load(),
zelf.proto.load(),
laddr
);
let _ = crate::vm::warn::warn(
vm.ctx.new_str(msg).into(),
Some(vm.ctx.exceptions.resource_warning.to_owned()),
1,
None,
vm,
);
}
let _ = zelf.close();
Ok(())
}
}

#[pyclass(
with(Constructor, Initializer, Representable, Destructor),
flags(BASETYPE)
)]
impl PySocket {
fn _init(
zelf: PyRef<Self>,
Expand Down Expand Up @@ -2139,38 +2176,6 @@ mod _socket {
Ok(())
}

#[pymethod]
fn __del__(&self, vm: &VirtualMachine) {
// Emit ResourceWarning if socket is still open
if self.sock.read().is_some() {
let laddr = if let Ok(sock) = self.sock()
&& let Ok(addr) = sock.local_addr()
&& let Ok(repr) = get_addr_tuple(&addr, vm).repr(vm)
{
format!(", laddr={}", repr.as_wtf8())
} else {
String::new()
};

let msg = format!(
"unclosed <socket.socket fd={}, family={}, type={}, proto={}{}>",
self.fileno(),
self.family.load(),
self.kind.load(),
self.proto.load(),
laddr
);
let _ = crate::vm::warn::warn(
vm.ctx.new_str(msg).into(),
Some(vm.ctx.exceptions.resource_warning.to_owned()),
1,
None,
vm,
);
}
let _ = self.close();
}

#[pymethod]
#[inline]
fn detach(&self) -> i64 {
Expand Down