Skip to content

Use ordinary fileno lookup in select #9266

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 2 commits into from
Oct 21, 2026
Merged

Use ordinary fileno lookup in select #9266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
704c1fd
Use ordinary fileno lookup in select
1ndahous3 Oct 20, 2026
fe9ab0c
Share select descriptor conversion
1ndahous3 Oct 20, 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
25 changes: 16 additions & 9 deletions crates/stdlib/src/select.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
pub(crate) use decl::module_def;

use crate::vm::{
PyObject, PyObjectRef, PyResult, TryFromObject, VirtualMachine, builtins::PyListRef,
PyObject, PyObjectRef, PyResult, TryFromObject, VirtualMachine,
builtins::{PyInt, PyListRef},
};
use rustpython_host_env::select::{self as host_select, FdSet, RawFd, platform::FD_SETSIZE};
use std::io;
Expand All @@ -17,14 +18,20 @@ struct Selectable {

impl TryFromObject for Selectable {
fn try_from_object(vm: &VirtualMachine, obj: PyObjectRef) -> PyResult<Self> {
let fno = obj.try_to_value(vm).or_else(|_| {
let meth = vm.get_method_or_type_error(
obj.clone(),
vm.ctx.interned_str("fileno").unwrap(),
|| "select arg must be an int or object with a fileno() method".to_owned(),
)?;
meth.call((), vm)?.try_into_value(vm)
})?;
let fileno;
let fd = if let Some(fd) = obj.downcast_ref::<PyInt>() {
fd
} else {
let meth = vm.get_attribute_opt(&obj, "fileno")?.ok_or_else(|| {
vm.new_type_error("select arg must be an int or object with a fileno() method")
})?;
fileno = meth
.call((), vm)?
.downcast::<PyInt>()
.map_err(|_| vm.new_type_error("fileno() returned a non-integer"))?;
&fileno
};
let fno = fd.try_to_primitive(vm)?;
Ok(Self { obj, fno })
}
}
Expand Down
32 changes: 32 additions & 0 deletions extra_tests/snippets/stdlib_select.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,3 +167,35 @@ def register_from_handler(signum, frame):
assert handled == [signal.SIGALRM], handled
idle.close()
idle_peer.close()


# fileno is an ordinary attribute, not a special method.
class InstanceFileno:
pass


class DynamicFileno:
def __getattr__(self, name):
if name == "fileno":
return lookup_reader.fileno
raise AttributeError(name)


class IndexOnly:
def __index__(self):
return lookup_reader.fileno()


lookup_reader, lookup_writer = socket.socketpair()
try:
lookup_writer.send(b"x")
instance = InstanceFileno()
instance.fileno = lookup_reader.fileno
for obj in (instance, DynamicFileno()):
assert select.select([obj], [], [], 0) == ([obj], [], [])
Comment thread
1ndahous3 marked this conversation as resolved.
Resolved
assert_raises(TypeError, select.select, [IndexOnly()], [], [], 0)
instance.fileno = IndexOnly
assert_raises(TypeError, select.select, [instance], [], [], 0)
finally:
lookup_reader.close()
lookup_writer.close()
Loading