date.fromordinal()

Author: neonene

Modules/_datetimemodule.c

@@ -3141,35 +3141,60 @@ datetime_date_fromtimestamp_capi(PyObject *cls, PyObject *args)
     return result;
 }
 
-/* Return new date from proleptic Gregorian ordinal.  Raises ValueError if
- * the ordinal is out of range.
- */
+/*[clinic input]
+@classmethod
+datetime.date.fromordinal
+
+    cls: self(type="PyObject *")
+    defcls: defining_class
+    ordinal: int
+    /
+
+int -> date corresponding to a proleptic Gregorian ordinal.
+
+Return new date from proleptic Gregorian ordinal.  Raises ValueError
+if the ordinal is out of range.
+[clinic start generated code]*/
+
 static PyObject *
-date_fromordinal(PyObject *cls, PyObject *args)
+datetime_date_fromordinal_impl(PyObject *cls, PyTypeObject *defcls,
+                               int ordinal)
+/*[clinic end generated code: output=fa7ca4621f1ee8be input=76c85e045fdfbc97]*/
 {
     PyObject *result = NULL;
-    int ordinal;
-
-    if (PyArg_ParseTuple(args, "i:fromordinal", &ordinal)) {
-        int year;
-        int month;
-        int day;
+    int year;
+    int month;
+    int day;
 
-        if (ordinal < 1)
-            PyErr_SetString(PyExc_ValueError, "ordinal must be "
-                                              ">= 1");
-        else {
-            ord_to_ymd(ordinal, &year, &month, &day);
-            datetime_state *st = find_module_state_by_def(cls);
-            result = new_date_subclass_ex(st, year, month, day, cls);
-        }
+    if (ordinal < 1) {
+        PyErr_SetString(PyExc_ValueError, "ordinal must be >= 1");
+    }
+    else {
+        ord_to_ymd(ordinal, &year, &month, &day);
+        datetime_state *st = get_module_state_by_cls(defcls);
+        result = new_date_subclass_ex(st, year, month, day, cls);
     }
     return result;
 }
 
-/* Return the new date from a string as generated by date.isoformat() */
+/*[clinic input]
+@classmethod
+datetime.date.fromisoformat
+
+    cls: self(type="PyObject *")
+    defcls: defining_class
+    dtstr: object
+    /
+
+str -> Construct a date from a string in ISO 8601 format.
+
+Return the new date from a string as generated by date.isoformat().
+[clinic start generated code]*/
+
 static PyObject *
-date_fromisoformat(PyObject *cls, PyObject *dtstr)
+datetime_date_fromisoformat_impl(PyObject *cls, PyTypeObject *defcls,
+                                 PyObject *dtstr)
+/*[clinic end generated code: output=c382fc14a39f8b89 input=67564908cc8f0013]*/
 {
     assert(dtstr != NULL);
 
@@ -3199,7 +3224,7 @@ date_fromisoformat(PyObject *cls, PyObject *dtstr)
     if (rv < 0) {
         goto invalid_string_error;
     }
-    datetime_state *st = find_module_state_by_def(cls);
+    datetime_state *st = get_module_state_by_cls(defcls);
     return new_date_subclass_ex(st, year, month, day, cls);
 
 invalid_string_error:
@@ -3717,15 +3742,8 @@ static PyMethodDef date_methods[] = {
 
     /* Class methods: */
     DATETIME_DATE_FROMTIMESTAMP_METHODDEF
-
-    {"fromordinal", (PyCFunction)date_fromordinal,      METH_VARARGS |
-                                                    METH_CLASS,
-     PyDoc_STR("int -> date corresponding to a proleptic Gregorian "
-               "ordinal.")},
-
-     {"fromisoformat", (PyCFunction)date_fromisoformat,  METH_O |
-                                                         METH_CLASS,
-      PyDoc_STR("str -> Construct a date from a string in ISO 8601 format.")},
+    DATETIME_DATE_FROMORDINAL_METHODDEF
+    DATETIME_DATE_FROMISOFORMAT_METHODDEF
 
      {"fromisocalendar", _PyCFunction_CAST(date_fromisocalendar),
       METH_VARARGS | METH_KEYWORDS | METH_CLASS,