Skip to content

Declare nullable datetime defaults directly #9559

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

Declare nullable datetime defaults directly #9559

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d16300e
Declare concrete datetime argument defaults directly
codex Nov 3, 2026
1d5d31e
Preserve omitted datetime string fast paths
codex Nov 3, 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
30 changes: 15 additions & 15 deletions crates/stdlib/src/_datetime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2800,8 +2800,8 @@ mod _datetime {
second: i32,
#[pyarg(any, default = 0)]
microsecond: i32,
#[pyarg(any, optional, py_default = "None")]
tzinfo: OptionalArg<PyObjectRef>,
#[pyarg(any, default = None)]
tzinfo: Option<PyObjectRef>,
#[pyarg(named, default = 0)]
fold: i32,
}
Expand Down Expand Up @@ -2850,7 +2850,7 @@ mod _datetime {
}

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));
let tzinfo = a.tzinfo.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 {
check_tzinfo_subclass(tz, vm)?;
Expand Down Expand Up @@ -3594,8 +3594,8 @@ mod _datetime {
second: i32,
#[pyarg(any, default = 0)]
microsecond: i32,
#[pyarg(any, optional, py_default = "None")]
tzinfo: OptionalArg<PyObjectRef>,
#[pyarg(any, default = None)]
tzinfo: Option<PyObjectRef>,
#[pyarg(named, default = 0)]
fold: i32,
}
Expand Down Expand Up @@ -3639,7 +3639,7 @@ mod _datetime {
}

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));
let tzinfo = a.tzinfo.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)?;
if let Some(tz) = &tzinfo {
Expand All @@ -3661,16 +3661,16 @@ mod _datetime {

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

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

#[derive(FromArgs)]
Expand Down Expand Up @@ -3715,8 +3715,8 @@ mod _datetime {

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

/// `_find_isoformat_datetime_separator`
Expand Down Expand Up @@ -3765,7 +3765,7 @@ mod _datetime {
impl PyDateTime {
#[pyclassmethod]
fn now(cls: PyTypeRef, args: NowArgs, vm: &VirtualMachine) -> PyResult {
let tz = args.tz.unwrap_or_none(vm);
let tz = args.tz.unwrap_or_else(|| vm.ctx.none());
check_tzinfo_subclass(&tz, vm)?;
let tzinfo = tzinfo_arg(tz, vm);
let result = datetime_best_possible(&cls, tzinfo.is_none(), tzinfo.clone(), vm)?;
Expand Down Expand Up @@ -3795,7 +3795,7 @@ mod _datetime {

#[pyclassmethod]
fn fromtimestamp(cls: PyTypeRef, args: FromTimestampArgs, vm: &VirtualMachine) -> PyResult {
let tz = args.tz.unwrap_or_none(vm);
let tz = args.tz.unwrap_or_else(|| vm.ctx.none());
check_tzinfo_subclass(&tz, vm)?;
let tzinfo = tzinfo_arg(tz, vm);
let (timet, us) = object_to_timeval(&args.timestamp, vm)?;
Expand Down Expand Up @@ -4168,7 +4168,7 @@ mod _datetime {

#[pymethod]
fn astimezone(zelf: &Py<Self>, args: AstimezoneArgs, vm: &VirtualMachine) -> PyResult {
let tz = args.tz.unwrap_or_none(vm);
let tz = args.tz.unwrap_or_else(|| vm.ctx.none());
check_tzinfo_subclass(&tz, vm)?;
let target = tzinfo_arg(tz, vm);
let local_zone = |vm: &VirtualMachine| -> PyResult<PyObjectRef> {
Expand Down
Loading