BUG: fix CRLF and kludge around datetime64 nanosecond JSON encoding issues per #1263

Author: wesm

pandas/src/ujson/lib/ultrajson.h

@@ -1,41 +1,41 @@
-#include <Python.h>
-#include "version.h"
-
-/* objToJSON */
-PyObject* objToJSON(PyObject* self, PyObject *args, PyObject *kwargs);
-void initObjToJSON(void);
-
-/* JSONToObj */
-PyObject* JSONToObj(PyObject* self, PyObject *args, PyObject *kwargs);
-
-/* objToJSONFile */
-PyObject* objToJSONFile(PyObject* self, PyObject *args, PyObject *kwargs);
-
-/* JSONFileToObj */
-PyObject* JSONFileToObj(PyObject* self, PyObject *args, PyObject *kwargs);
-
-
-static PyMethodDef ujsonMethods[] = {
-	{"encode", (PyCFunction) objToJSON, METH_VARARGS | METH_KEYWORDS, "Converts arbitrary object recursivly into JSON. Use ensure_ascii=false to output UTF-8. Pass in double_precision to alter the maximum digit precision with doubles"},
-	{"decode", (PyCFunction) JSONToObj, METH_VARARGS | METH_KEYWORDS, "Converts JSON as string to dict object structure"},
-	{"dumps", (PyCFunction) objToJSON, METH_VARARGS | METH_KEYWORDS,  "Converts arbitrary object recursivly into JSON. Use ensure_ascii=false to output UTF-8"},
-	{"loads", (PyCFunction) JSONToObj, METH_VARARGS | METH_KEYWORDS,  "Converts JSON as string to dict object structure"},
-	{"dump", (PyCFunction) objToJSONFile, METH_VARARGS | METH_KEYWORDS, "Converts arbitrary object recursively into JSON file. Use ensure_ascii=false to output UTF-8"},
-	{"load", (PyCFunction) JSONFileToObj, METH_VARARGS | METH_KEYWORDS, "Converts JSON as file to dict object structure"},
-	{NULL, NULL, 0, NULL}		/* Sentinel */
-};
-
-
-
-PyMODINIT_FUNC
-init_ujson(void)
-{
-	PyObject *module;
-	PyObject *version_string;
-
-	initObjToJSON();
-	module = Py_InitModule("_ujson", ujsonMethods);
-
-	version_string = PyString_FromString (UJSON_VERSION);
-	PyModule_AddObject (module, "__version__", version_string);
-}
+#include <Python.h>
+#include "version.h"
+
+/* objToJSON */
+PyObject* objToJSON(PyObject* self, PyObject *args, PyObject *kwargs);
+void initObjToJSON(void);
+
+/* JSONToObj */
+PyObject* JSONToObj(PyObject* self, PyObject *args, PyObject *kwargs);
+
+/* objToJSONFile */
+PyObject* objToJSONFile(PyObject* self, PyObject *args, PyObject *kwargs);
+
+/* JSONFileToObj */
+PyObject* JSONFileToObj(PyObject* self, PyObject *args, PyObject *kwargs);
+
+
+static PyMethodDef ujsonMethods[] = {
+	{"encode", (PyCFunction) objToJSON, METH_VARARGS | METH_KEYWORDS, "Converts arbitrary object recursivly into JSON. Use ensure_ascii=false to output UTF-8. Pass in double_precision to alter the maximum digit precision with doubles"},
+	{"decode", (PyCFunction) JSONToObj, METH_VARARGS | METH_KEYWORDS, "Converts JSON as string to dict object structure"},
+	{"dumps", (PyCFunction) objToJSON, METH_VARARGS | METH_KEYWORDS,  "Converts arbitrary object recursivly into JSON. Use ensure_ascii=false to output UTF-8"},
+	{"loads", (PyCFunction) JSONToObj, METH_VARARGS | METH_KEYWORDS,  "Converts JSON as string to dict object structure"},
+	{"dump", (PyCFunction) objToJSONFile, METH_VARARGS | METH_KEYWORDS, "Converts arbitrary object recursively into JSON file. Use ensure_ascii=false to output UTF-8"},
+	{"load", (PyCFunction) JSONFileToObj, METH_VARARGS | METH_KEYWORDS, "Converts JSON as file to dict object structure"},
+	{NULL, NULL, 0, NULL}		/* Sentinel */
+};
+
+
+
+PyMODINIT_FUNC
+init_ujson(void)
+{
+	PyObject *module;
+	PyObject *version_string;
+
+	initObjToJSON();
+	module = Py_InitModule("_ujson", ujsonMethods);
+
+	version_string = PyString_FromString (UJSON_VERSION);
+	PyModule_AddObject (module, "__version__", version_string);
+}

pandas/src/ujson/lib/ultrajsondec.c

@@ -2005,9 +2005,8 @@ def _check_orient(df, orient, dtype=None, numpy=True):
             unser = DataFrame.from_json(dfjson, orient=orient, dtype=dtype,
                                         numpy=numpy)
             unser = unser.sort()
-            mktimestamp = datetime.fromtimestamp
             if df.index.dtype.type == np.datetime64:
-                unser.index = [mktimestamp(float(d)) for d in unser.index]
+                unser.index = DatetimeIndex(unser.index.values.astype('i8'))
             if orient == "records":
                 # index is not captured in this orientation
                 assert_almost_equal(df.values, unser.values)

pandas/src/ujson/lib/ultrajsonenc.c

@@ -326,8 +326,7 @@ def _check_orient(series, orient, dtype=None, numpy=True):
                                      orient=orient, numpy=numpy, dtype=dtype)
             unser = unser.sort_index()
             if series.index.dtype.type == np.datetime64:
-                mktimestamp = date.fromtimestamp
-                unser.index = [mktimestamp(float(d)) for d in unser.index]
+                unser.index = DatetimeIndex(unser.index.values.astype('i8'))
             if orient == "records" or orient == "values":
                 assert_almost_equal(series.values, unser.values)
             else: