fixup: Compatible pickle for packed struct

Author: shramov

Modules/_datetimemodule.c

@@ -3191,6 +3191,7 @@ date_from_pickle(PyTypeObject *type, PyObject *state)
     if (me != NULL) {
         const char *pdata = PyBytes_AS_STRING(state);
         memcpy(&me->data, pdata, _PyDateTime_DATE_DATASIZE);
+        me->data.year = be16toh(me->data.year);
         me->hashcode = -1;
     }
     return (PyObject *)me;
@@ -3966,7 +3967,9 @@ static PyObject *
 date_getstate(PyDateTime_Date *self)
 {
     PyObject* field;
-    field = PyBytes_FromStringAndSize((char*)&self->data,
+    _PyDateTime_DateData tmp = self->data;
+    tmp.year = htobe16(tmp.year);
+    field = PyBytes_FromStringAndSize((char*)&tmp,
                                        _PyDateTime_DATE_DATASIZE);
     return Py_BuildValue("(N)", field);
 }
@@ -4652,6 +4655,7 @@ time_from_pickle(PyTypeObject *type, PyObject *state, PyObject *tzinfo)
         const char *pdata = PyBytes_AS_STRING(state);
 
         memcpy(&me->data, pdata, _PyDateTime_TIME_DATASIZE);
+        me->data.microsecond = be32toh(me->data.microsecond) >> 8;
         me->hashcode = -1;
         me->hastzinfo = aware;
         if (aware) {
@@ -5232,7 +5236,9 @@ time_getstate(PyDateTime_Time *self, int proto)
     PyObject *basestate;
     PyObject *result = NULL;
 
-    basestate =  PyBytes_FromStringAndSize((char *)&self->data,
+    _PyDateTime_TimeData tmp = self->data;
+    tmp.microsecond = htobe32(tmp.microsecond << 8);
+    basestate =  PyBytes_FromStringAndSize((char *)&tmp,
                                             _PyDateTime_TIME_DATASIZE);
     if (basestate != NULL) {
         if (proto > 3 && TIME_GET_FOLD(self))
@@ -5428,6 +5434,8 @@ datetime_from_pickle(PyTypeObject *type, PyObject *state, PyObject *tzinfo)
         const char *pdata = PyBytes_AS_STRING(state);
 
         memcpy(&me->data, pdata, _PyDateTime_DATETIME_DATASIZE);
+        me->data.year = be16toh(me->data.year);
+        me->data.microsecond = be32toh(me->data.microsecond) >> 8;
         me->hashcode = -1;
         me->hastzinfo = aware;
         if (aware) {
@@ -7154,7 +7162,10 @@ datetime_getstate(PyDateTime_DateTime *self, int proto)
     PyObject *basestate;
     PyObject *result = NULL;
 
-    basestate = PyBytes_FromStringAndSize((char *)&self->data,
+    _PyDateTime_DateTimeData tmp = self->data;
+    tmp.year = htobe16(tmp.year);
+    tmp.microsecond = htobe32(tmp.microsecond << 8);
+    basestate = PyBytes_FromStringAndSize((char *)&tmp,
                                            _PyDateTime_DATETIME_DATASIZE);
     if (basestate != NULL) {
         if (proto > 3 && DATE_GET_FOLD(self))