Skip to content

gh-117398: datetime: Use wrappers for C-API functions #118115

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

Closed
neonene wants to merge 9 commits into from
Closed

gh-117398: datetime: Use wrappers for C-API functions #118115

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2323b86
wrap 5 functions
neonene Apr 19, 2024
aa573b5
remove _ex _ex2 suffixes from capi funcs
neonene Apr 20, 2024
6df6610
nit
neonene Apr 20, 2024
ba60844
wrap more functions
neonene Apr 20, 2024
e9f6f33
Merge branch 'main' into wrapper
neonene Apr 20, 2024
a426e8f
reconsider capi name
neonene Apr 21, 2024
87408a9
rename internal _ex _ex2 functions except reduce()
neonene Apr 21, 2024
987ba37
remove new_datetime_nofold()
neonene Apr 21, 2024
93fb786
remove new_datetime_subclass_nofold()
neonene Apr 21, 2024
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
remove new_datetime_nofold()
  • Loading branch information
@neonene
neonene committed Apr 21, 2024
commit 987ba373e99adb7419ac646e1ff7db5e4e06c984
53 changes: 20 additions & 33 deletions Modules/_datetimemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,34 +990,10 @@ new_date_capi(int year, int month, int day, PyTypeObject *type)
return _new_date(year, month, day, type);
}

// Forward declaration
static inline PyObject *
new_datetime_nofold(int, int, int, int, int, int, int, PyObject *, PyTypeObject *);

/* Create date instance with no range checking, or call subclass constructor */
static inline PyObject *
new_date_subclass(int year, int month, int day, PyObject *cls)
{
PyObject *result;
// We have "fast path" constructors for two subclasses: date and datetime
if ((PyTypeObject *)cls == &PyDateTime_DateType) {
result = _new_date(year, month, day, (PyTypeObject *)cls);
}
else if ((PyTypeObject *)cls == &PyDateTime_DateTimeType) {
result = new_datetime_nofold(year, month, day, 0, 0, 0, 0, Py_None,
(PyTypeObject *)cls);
}
else {
result = PyObject_CallFunction(cls, "iii", year, month, day);
}

return result;
}

/* Create a datetime instance with no range checking. */
static inline PyObject *
_new_datetime(int year, int month, int day, int hour, int minute,
int second, int usecond, PyObject *tzinfo, int fold, PyTypeObject *type)
_new_datetime(int year, int month, int day, int hour, int minute, int second,
int usecond, PyObject *tzinfo, int fold, PyTypeObject *type)
{
PyDateTime_DateTime *self;
char aware = tzinfo != Py_None;
Expand Down Expand Up @@ -1048,22 +1024,33 @@ _new_datetime(int year, int month, int day, int hour, int minute,
return (PyObject *)self;
}

/* Create date instance with no range checking, or call subclass constructor */
static inline PyObject *
new_datetime_nofold(int year, int month, int day, int hour, int minute,
int second, int usecond, PyObject *tzinfo,
PyTypeObject *type)
new_date_subclass(int year, int month, int day, PyObject *cls)
{
return _new_datetime(year, month, day, hour, minute, second,
usecond, tzinfo, 0, type);
PyObject *result;
// We have "fast path" constructors for two subclasses: date and datetime
if ((PyTypeObject *)cls == &PyDateTime_DateType) {
result = _new_date(year, month, day, (PyTypeObject *)cls);
}
else if ((PyTypeObject *)cls == &PyDateTime_DateTimeType) {
result = _new_datetime(year, month, day, 0, 0, 0, 0, Py_None, 0,
(PyTypeObject *)cls);
}
else {
result = PyObject_CallFunction(cls, "iii", year, month, day);
}

return result;
}

static PyObject *
new_datetime_nofold_capi(int year, int month, int day, int hour, int minute,
int second, int usecond, PyObject *tzinfo,
PyTypeObject *type)
{
return new_datetime_nofold(year, month, day, hour, minute, second,
usecond, tzinfo, type);
return _new_datetime(year, month, day, hour, minute, second,
usecond, tzinfo, 0, type);
}

static PyObject *
Expand Down