From c0a4f5b51d238fd2abb59939619afa585b9443c6 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Mon, 9 Dec 2019 19:48:34 -0800 Subject: [PATCH 1/2] Removed dead JSON code --- pandas/_libs/src/ujson/python/objToJSON.c | 35 ----------------------- 1 file changed, 35 deletions(-) diff --git a/pandas/_libs/src/ujson/python/objToJSON.c b/pandas/_libs/src/ujson/python/objToJSON.c index ecfe1250f6f45..01eab3ad2cdff 100644 --- a/pandas/_libs/src/ujson/python/objToJSON.c +++ b/pandas/_libs/src/ujson/python/objToJSON.c @@ -534,23 +534,6 @@ static int NpyTypeToJSONType(PyObject *obj, JSONTypeContext *tc, int npyType, npy_double doubleVal; npy_int64 longVal; - if (PyTypeNum_ISFLOAT(npyType)) { - PRINTMARK(); - castfunc = - PyArray_GetCastFunc(PyArray_DescrFromType(npyType), NPY_DOUBLE); - if (!castfunc) { - PyErr_Format(PyExc_ValueError, - "Cannot cast numpy dtype %d to double", npyType); - } - castfunc(value, &doubleVal, 1, NULL, NULL); - if (npy_isnan(doubleVal) || npy_isinf(doubleVal)) { - PRINTMARK(); - return JT_NULL; - } - GET_TC(tc)->doubleValue = (double)doubleVal; - return JT_DOUBLE; - } - if (PyTypeNum_ISDATETIME(npyType)) { PRINTMARK(); castfunc = @@ -581,24 +564,6 @@ static int NpyTypeToJSONType(PyObject *obj, JSONTypeContext *tc, int npyType, } } - if (PyTypeNum_ISINTEGER(npyType)) { - PRINTMARK(); - castfunc = - PyArray_GetCastFunc(PyArray_DescrFromType(npyType), NPY_INT64); - if (!castfunc) { - PyErr_Format(PyExc_ValueError, "Cannot cast numpy dtype %d to long", - npyType); - } - castfunc(value, &longVal, 1, NULL, NULL); - GET_TC(tc)->longValue = (JSINT64)longVal; - return JT_LONG; - } - - if (PyTypeNum_ISBOOL(npyType)) { - PRINTMARK(); - return *((npy_bool *)value) == NPY_TRUE ? JT_TRUE : JT_FALSE; - } - PRINTMARK(); return JT_INVALID; } From ef4fba8514fc13df7a0e660807a56d227ec3319c Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Mon, 9 Dec 2019 19:51:23 -0800 Subject: [PATCH 2/2] Build warning cleanup --- pandas/_libs/src/ujson/python/objToJSON.c | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas/_libs/src/ujson/python/objToJSON.c b/pandas/_libs/src/ujson/python/objToJSON.c index 01eab3ad2cdff..a68fad8a24664 100644 --- a/pandas/_libs/src/ujson/python/objToJSON.c +++ b/pandas/_libs/src/ujson/python/objToJSON.c @@ -531,7 +531,6 @@ static void *PyTimeToJSON(JSOBJ _obj, JSONTypeContext *tc, void *outValue, static int NpyTypeToJSONType(PyObject *obj, JSONTypeContext *tc, int npyType, void *value) { PyArray_VectorUnaryFunc *castfunc; - npy_double doubleVal; npy_int64 longVal; if (PyTypeNum_ISDATETIME(npyType)) {