Reverse time and inc for Timestamp (de)serialization

Author: RedBeard0531

pymongo/_cbsonmodule.c

@@ -467,7 +467,7 @@ static int write_element_to_buffer(bson_buffer* buffer, int type_byte, PyObject*
         PyObject* obj;
         long i;
 
-        obj = PyObject_GetAttrString(value, "time");
+        obj = PyObject_GetAttrString(value, "inc");
         if (!obj) {
             return 0;
         }
@@ -477,7 +477,7 @@ static int write_element_to_buffer(bson_buffer* buffer, int type_byte, PyObject*
             return 0;
         }
 
-        obj = PyObject_GetAttrString(value, "inc");
+        obj = PyObject_GetAttrString(value, "time");
         if (!obj) {
             return 0;
         }
@@ -1438,11 +1438,11 @@ static PyObject* get_value(const char* buffer, int* position, int type) {
         }
     case 17:
         {
-            int i,
-                j;
-            memcpy(&i, buffer + *position, 4);
-            memcpy(&j, buffer + *position + 4, 4);
-            value = PyObject_CallFunction(Timestamp, "ii", i, j);
+            int time,
+                inc;
+            memcpy(&inc, buffer + *position, 4);
+            memcpy(&time, buffer + *position + 4, 4);
+            value = PyObject_CallFunction(Timestamp, "ii", time, inc);
             if (!value) {
                 return NULL;
             }

pymongo/bson.py

@@ -327,8 +327,8 @@ def _get_ref(data):
 
 
 def _get_timestamp(data):
-    (timestamp, data) = _get_int(data)
     (inc, data) = _get_int(data)
+    (timestamp, data) = _get_int(data)
     return (Timestamp(timestamp, inc), data)
 
 def _get_long(data):
@@ -451,7 +451,7 @@ def _element_to_bson(key, value, check_keys):
     if isinstance(value, Timestamp):
         time = struct.pack("<i", value.time)
         inc = struct.pack("<i", value.inc)
-        return "\x11" + name + time + inc
+        return "\x11" + name + inc + time
     if value is None:
         return "\x0A" + name
     if isinstance(value, _RE_TYPE):

test/test_bson.py

@@ -77,8 +77,8 @@ def test_basic_to_dict(self):
 
     def test_data_timestamp(self):
         self.assertEqual({"test": Timestamp(4, 20)},
-                         BSON("\x13\x00\x00\x00\x11\x74\x65\x73\x74\x00\x04"
-                              "\x00\x00\x00\x14\x00\x00\x00\x00").to_dict())
+                         BSON("\x13\x00\x00\x00\x11\x74\x65\x73\x74\x00\x14"
+                              "\x00\x00\x00\x04\x00\x00\x00\x00").to_dict())
 
     def test_basic_from_dict(self):
         self.assertRaises(TypeError, BSON.from_dict, 100)