Skip to content

Fix datetime constructor and method signature metadata #9532

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
Nov 3, 2026
Merged

Fix datetime constructor and method signature metadata #9532

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
15d64db
Expose accurate datetime constructor and method signatures
codex Nov 2, 2026
456d257
Report signature mismatches during existing CI scan
codex Nov 2, 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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ jobs:

- name: Check whats_left is not broken
shell: bash
run: python -I scripts/whats_left.py --rustpython target/release/rustpython
run: python -I scripts/whats_left.py --signature --rustpython target/release/rustpython

clippy:
# Named after the matrix entry rather than left to be named for it: a
Expand Down
107 changes: 66 additions & 41 deletions crates/stdlib/src/_datetime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,19 +564,19 @@ mod _datetime {

#[derive(FromArgs)]
pub(super) struct DeltaArgs {
#[pyarg(any, optional)]
#[pyarg(any, optional, py_default = "0")]
days: OptionalArg<PyObjectRef>,
#[pyarg(any, optional)]
#[pyarg(any, optional, py_default = "0")]
seconds: OptionalArg<PyObjectRef>,
#[pyarg(any, optional)]
#[pyarg(any, optional, py_default = "0")]
microseconds: OptionalArg<PyObjectRef>,
#[pyarg(any, optional)]
#[pyarg(any, optional, py_default = "0")]
milliseconds: OptionalArg<PyObjectRef>,
#[pyarg(any, optional)]
#[pyarg(any, optional, py_default = "0")]
minutes: OptionalArg<PyObjectRef>,
#[pyarg(any, optional)]
#[pyarg(any, optional, py_default = "0")]
hours: OptionalArg<PyObjectRef>,
#[pyarg(any, optional)]
#[pyarg(any, optional, py_default = "0")]
weeks: OptionalArg<PyObjectRef>,
}

Expand Down Expand Up @@ -1724,7 +1724,7 @@ mod _datetime {
}

#[derive(FromArgs)]
struct DateArgs {
pub(super) struct DateArgs {
#[pyarg(any)]
year: i32,
#[pyarg(any)]
Expand All @@ -1734,15 +1734,24 @@ mod _datetime {
}

impl Constructor for PyDate {
type Args = FuncArgs;
type Args = DateArgs;

fn py_new(_cls: &Py<PyType>, args: FuncArgs, vm: &VirtualMachine) -> PyResult<Self> {
fn slot_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
if args.args.len() == 1
&& let Some(state) = pickle_state(&args.args[0], 4, 2, month_is_sane, "date", vm)?
{
return Ok(Self::from_state(&state));
let payload = Self::from_state(&state);
drop(args);
return payload.into_ref_with_type(vm, cls).map(Into::into);
}
let DateArgs { year, month, day } = args.bind(vm)?;
let args = args.bind(vm)?;
Self::py_new(&cls, args, vm)?
.into_ref_with_type(vm, cls)
.map(Into::into)
}

fn py_new(_cls: &Py<PyType>, args: Self::Args, vm: &VirtualMachine) -> PyResult<Self> {
let DateArgs { year, month, day } = args;
check_date_args(year, month, day, vm)?;
Ok(Self::new(year, month, day))
}
Expand Down Expand Up @@ -1969,8 +1978,8 @@ mod _datetime {
}

#[pyclassmethod]
fn fromisoformat(cls: PyTypeRef, object: PyObjectRef, vm: &VirtualMachine) -> PyResult {
let dtstr = object;
fn fromisoformat(cls: PyTypeRef, string: PyObjectRef, vm: &VirtualMachine) -> PyResult {
let dtstr = string;
let Some(s) = dtstr.downcast_ref::<PyStr>() else {
return Err(vm.new_type_error("fromisoformat: argument must be str"));
};
Expand Down Expand Up @@ -2037,8 +2046,8 @@ mod _datetime {
}

#[pymethod]
fn __format__(zelf: PyObjectRef, spec: PyObjectRef, vm: &VirtualMachine) -> PyResult {
object_format(&zelf, spec, vm)
fn __format__(zelf: PyObjectRef, format: PyObjectRef, vm: &VirtualMachine) -> PyResult {
object_format(&zelf, format, vm)
}

#[pymethod]
Expand Down Expand Up @@ -2782,7 +2791,7 @@ mod _datetime {
}

#[derive(FromArgs)]
struct TimeArgs {
pub(super) struct TimeArgs {
#[pyarg(any, default = 0)]
hour: i32,
#[pyarg(any, default = 0)]
Expand All @@ -2791,7 +2800,7 @@ mod _datetime {
second: i32,
#[pyarg(any, default = 0)]
microsecond: i32,
#[pyarg(any, optional)]
#[pyarg(any, optional, py_default = "None")]
tzinfo: OptionalArg<PyObjectRef>,
#[pyarg(named, default = 0)]
fold: i32,
Expand All @@ -2813,26 +2822,34 @@ mod _datetime {
}

impl Constructor for PyTime {
type Args = FuncArgs;
type Args = TimeArgs;

fn py_new(_cls: &Py<PyType>, args: FuncArgs, vm: &VirtualMachine) -> PyResult<Self> {
fn slot_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
if (1..=2).contains(&args.args.len())
&& let Some(state) =
pickle_state(&args.args[0], 6, 0, |hour| (hour & 0x7f) < 24, "time", vm)?
{
let tzinfo = pickle_tzinfo(args.args.get(1), vm)?;
let fold = (state[0] & 0x80) != 0;
let us = i32::from(state[3]) << 16 | i32::from(state[4]) << 8 | i32::from(state[5]);
return Ok(Self::new(
let payload = Self::new(
i32::from(state[0] & 0x7f),
i32::from(state[1]),
i32::from(state[2]),
us,
tzinfo,
i32::from(fold),
));
);
drop(args);
return payload.into_ref_with_type(vm, cls).map(Into::into);
}
let a: TimeArgs = args.bind(vm)?;
let args = args.bind(vm)?;
Self::py_new(&cls, args, vm)?
.into_ref_with_type(vm, cls)
.map(Into::into)
}

fn py_new(_cls: &Py<PyType>, a: Self::Args, vm: &VirtualMachine) -> PyResult<Self> {
let tzinfo = a.tzinfo.into_option().and_then(|tz| tzinfo_arg(tz, vm));
check_time_args(a.hour, a.minute, a.second, a.microsecond, a.fold, vm)?;
if let Some(tz) = &tzinfo {
Expand Down Expand Up @@ -2867,7 +2884,7 @@ mod _datetime {

#[derive(FromArgs)]
struct TimeIsoformatArgs {
#[pyarg(any, optional)]
#[pyarg(any, optional, py_default = "'auto'")]
timespec: OptionalArg<PyStrRef>,
}

Expand Down Expand Up @@ -2968,8 +2985,8 @@ mod _datetime {
}

#[pymethod]
fn __format__(zelf: PyObjectRef, spec: PyObjectRef, vm: &VirtualMachine) -> PyResult {
object_format(&zelf, spec, vm)
fn __format__(zelf: PyObjectRef, format: PyObjectRef, vm: &VirtualMachine) -> PyResult {
object_format(&zelf, format, vm)
}

#[pymethod]
Expand Down Expand Up @@ -3018,8 +3035,8 @@ mod _datetime {
}

#[pyclassmethod]
fn fromisoformat(cls: PyTypeRef, object: PyObjectRef, vm: &VirtualMachine) -> PyResult {
let tstr = object;
fn fromisoformat(cls: PyTypeRef, string: PyObjectRef, vm: &VirtualMachine) -> PyResult {
let tstr = string;
let Some(s) = tstr.downcast_ref::<PyStr>() else {
return Err(vm.new_type_error("fromisoformat: argument must be str"));
};
Expand Down Expand Up @@ -3562,7 +3579,7 @@ mod _datetime {
}

#[derive(FromArgs)]
struct DateTimeArgs {
pub(super) struct DateTimeArgs {
#[pyarg(any)]
year: i32,
#[pyarg(any)]
Expand All @@ -3577,16 +3594,16 @@ mod _datetime {
second: i32,
#[pyarg(any, default = 0)]
microsecond: i32,
#[pyarg(any, optional)]
#[pyarg(any, optional, py_default = "None")]
tzinfo: OptionalArg<PyObjectRef>,
#[pyarg(named, default = 0)]
fold: i32,
}

impl Constructor for PyDateTime {
type Args = FuncArgs;
type Args = DateTimeArgs;

fn py_new(_cls: &Py<PyType>, args: FuncArgs, vm: &VirtualMachine) -> PyResult<Self> {
fn slot_new(cls: PyTypeRef, args: FuncArgs, vm: &VirtualMachine) -> PyResult {
if (1..=2).contains(&args.args.len())
&& let Some(state) = pickle_state(
&args.args[0],
Expand All @@ -3601,7 +3618,7 @@ mod _datetime {
let fold = (state[2] & 0x80) != 0;
let date = PyDate::from_state(&[state[0], state[1], state[2] & 0x7f, state[3]]);
let us = i32::from(state[7]) << 16 | i32::from(state[8]) << 8 | i32::from(state[9]);
return Ok(Self::new(
let payload = Self::new(
date.y(),
date.m(),
date.d(),
Expand All @@ -3611,9 +3628,17 @@ mod _datetime {
us,
tzinfo,
i32::from(fold),
));
);
drop(args);
return payload.into_ref_with_type(vm, cls).map(Into::into);
}
let a: DateTimeArgs = args.bind(vm)?;
let args = args.bind(vm)?;
Self::py_new(&cls, args, vm)?
.into_ref_with_type(vm, cls)
.map(Into::into)
}

fn py_new(_cls: &Py<PyType>, a: Self::Args, vm: &VirtualMachine) -> PyResult<Self> {
let tzinfo = a.tzinfo.into_option().and_then(|tz| tzinfo_arg(tz, vm));
check_date_args(a.year, a.month, a.day, vm)?;
check_time_args(a.hour, a.minute, a.second, a.microsecond, a.fold, vm)?;
Expand Down Expand Up @@ -3644,7 +3669,7 @@ mod _datetime {
struct FromTimestampArgs {
#[pyarg(any)]
timestamp: PyObjectRef,
#[pyarg(any, optional)]
#[pyarg(any, optional, py_default = "None")]
tz: OptionalArg<PyObjectRef>,
}

Expand All @@ -3660,9 +3685,9 @@ mod _datetime {

#[derive(FromArgs)]
struct DateTimeIsoformatArgs {
#[pyarg(any, optional)]
#[pyarg(any, optional, py_default = "'T'")]
sep: OptionalArg<PyObjectRef>,
#[pyarg(any, optional)]
#[pyarg(any, optional, py_default = "'auto'")]
timespec: OptionalArg<PyStrRef>,
}

Expand Down Expand Up @@ -3690,7 +3715,7 @@ mod _datetime {

#[derive(FromArgs)]
struct AstimezoneArgs {
#[pyarg(any, optional)]
#[pyarg(any, optional, py_default = "None")]
tz: OptionalArg<PyObjectRef>,
}

Expand Down Expand Up @@ -3848,8 +3873,8 @@ mod _datetime {
}

#[pyclassmethod]
fn fromisoformat(cls: PyTypeRef, object: PyObjectRef, vm: &VirtualMachine) -> PyResult {
let dtstr = object;
fn fromisoformat(cls: PyTypeRef, string: PyObjectRef, vm: &VirtualMachine) -> PyResult {
let dtstr = string;
let Some(s) = dtstr.downcast_ref::<PyStr>() else {
return Err(vm.new_type_error("fromisoformat: argument must be str"));
};
Expand Down
Loading