fix constructors

Author: SmartManoj

Include/datetime.h

@@ -178,9 +178,9 @@ typedef struct {
 
     /* constructors */
     PyObject *(*Date_FromDate)(int, int, int, PyTypeObject*);
-    PyObject *(*DateTime_FromDateAndTime)(int, int, int, int, int, int, int, int,
-        PyObject*, PyTypeObject*);
-    PyObject *(*Time_FromTime)(int, int, int, int, int, PyObject*, PyTypeObject*);
+    PyObject *(*DateTime_FromDateAndTime)(int, int, int, int, int, int, int,
+        PyObject*, int, int, PyTypeObject*);
+    PyObject *(*Time_FromTime)(int, int, int, int, PyObject*, int, int, PyTypeObject*);
     PyObject *(*Delta_FromDelta)(int, int, int, int, int, PyTypeObject*);
     PyObject *(*TimeZone_FromTimeZone)(PyObject *offset, PyObject *name);
 
@@ -189,9 +189,9 @@ typedef struct {
     PyObject *(*Date_FromTimestamp)(PyObject*, PyObject*);
 
     /* PEP 495 constructors */
-    PyObject *(*DateTime_FromDateAndTimeAndFold)(int, int, int, int, int, int, int, int,
-        PyObject*, int, PyTypeObject*);
-    PyObject *(*Time_FromTimeAndFold)(int, int, int, int, int, PyObject*, int, PyTypeObject*);
+    PyObject *(*DateTime_FromDateAndTimeAndFold)(int, int, int, int, int, int, int,
+        PyObject*, int, int, PyTypeObject*);
+    PyObject *(*Time_FromTimeAndFold)(int, int, int, int, PyObject*, int, int, PyTypeObject*);
 
 } PyDateTime_CAPI;
 
@@ -235,15 +235,15 @@ static PyDateTime_CAPI *PyDateTimeAPI = NULL;
 
 #define PyDateTime_FromDateAndTime(year, month, day, hour, min, sec, usec, nanosec) \
     PyDateTimeAPI->DateTime_FromDateAndTime((year), (month), (day), (hour), \
-        (min), (sec), (usec), Py_None, (nanosec), PyDateTimeAPI->DateTimeType)
+        (min), (sec), (usec), Py_None, 0, (nanosec), PyDateTimeAPI->DateTimeType)
 
 #define PyDateTime_FromDateAndTimeAndFold(year, month, day, hour, min, sec, usec, fold, nanosec) \
     PyDateTimeAPI->DateTime_FromDateAndTimeAndFold((year), (month), (day), (hour), \
         (min), (sec), (usec), Py_None, (fold), (nanosec), PyDateTimeAPI->DateTimeType)
 
 #define PyTime_FromTime(hour, minute, second, usecond, nanosec) \
     PyDateTimeAPI->Time_FromTime((hour), (minute), (second), (usecond), \
-        Py_None, (nanosec), PyDateTimeAPI->TimeType)
+        Py_None, 0, (nanosec), PyDateTimeAPI->TimeType)
 
 #define PyTime_FromTimeAndFold(hour, minute, second, usecond, nanosec, fold) \
     PyDateTimeAPI->Time_FromTimeAndFold((hour), (minute), (second), (usecond), \

Modules/_datetimemodule.c

@@ -1178,7 +1178,7 @@ parse_isoformat_time(const char *dtstr, size_t dtlen, int *hour, int *minute,
     tzinfo_pos++;
     int tzhour = 0, tzminute = 0, tzsecond = 0;
     rv = parse_hh_mm_ss_ff(tzinfo_pos, p_end, &tzhour, &tzminute, &tzsecond,
-                           &tzmicrosecond, &tznanosecond);
+                           tzmicrosecond, tznanosecond);
 
     *tzoffset = tzsign * ((tzhour * 3600) + (tzminute * 60) + tzsecond);
     *tzmicrosecond *= tzsign;
@@ -1270,10 +1270,10 @@ new_datetime_ex2(int year, int month, int day, int hour, int minute,
 
 static PyObject *
 new_datetime_ex(int year, int month, int day, int hour, int minute,
-                int second, int microsecond, PyObject *tzinfo, int nanosecond, PyTypeObject *type)
+                int second, int microsecond, PyObject *tzinfo, PyTypeObject *type)
 {
     return new_datetime_ex2(year, month, day, hour, minute, second, microsecond,
-                            tzinfo, 0, nanosecond, type);
+                            tzinfo, type);
 }
 
 #define new_datetime(y, m, d, hh, mm, ss, us, tzinfo, fold, ns) \
@@ -1376,9 +1376,9 @@ new_time_ex2(int hour, int minute, int second, int microsecond,
 
 static PyObject *
 new_time_ex(int hour, int minute, int second, int microsecond,
-            PyObject *tzinfo, int nanosecond, PyTypeObject *type)
+            PyObject *tzinfo, PyTypeObject *type)
 {
-    return new_time_ex2(hour, minute, second, microsecond, tzinfo, 0, nanosecond, type);
+    return new_time_ex2(hour, minute, second, microsecond, tzinfo, type);
 }
 
 #define new_time(hh, mm, ss, us, tzinfo, fold, ns)  \

Modules/_testcapi/datetime.c

@@ -225,7 +225,7 @@ get_datetime_fromdateandtime(PyObject *self, PyObject *args)
         rv = PyDateTimeAPI->DateTime_FromDateAndTime(
                 year, month, day,
                 hour, minute, second, microsecond,
-                Py_None, nanosecond,
+                Py_None, 0, nanosecond,
                 PyDateTimeAPI->DateTimeType);
     }
     return rv;
@@ -284,7 +284,7 @@ get_time_fromtime(PyObject *self, PyObject *args)
     else {
         rv = PyDateTimeAPI->Time_FromTime(
                 hour, minute, second, microsecond,
-                Py_None, nanosecond,
+                Py_None, 0, nanosecond,
                 PyDateTimeAPI->TimeType);
     }
     return rv;