From 7ff7fb909176d986323401e20b49a42954d438a6 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Fri, 31 Jan 2020 09:32:51 -0700 Subject: [PATCH 1/2] Removed basicTypeContext --- pandas/_libs/src/ujson/python/objToJSON.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/pandas/_libs/src/ujson/python/objToJSON.c b/pandas/_libs/src/ujson/python/objToJSON.c index 62c2870c198c4..1a39a40dd67f8 100644 --- a/pandas/_libs/src/ujson/python/objToJSON.c +++ b/pandas/_libs/src/ujson/python/objToJSON.c @@ -127,7 +127,6 @@ typedef struct __PyObjectEncoder { // pass-through to encode numpy data directly int npyType; void *npyValue; - TypeContext basicTypeContext; int datetimeIso; NPY_DATETIMEUNIT datetimeUnit; @@ -2115,10 +2114,7 @@ void Object_endTypeContext(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) { PyObject_Free(GET_TC(tc)->cStr); GET_TC(tc)->cStr = NULL; - if (tc->prv != - &(((PyObjectEncoder *)tc->encoder)->basicTypeContext)) { // NOLINT - PyObject_Free(tc->prv); - } + PyObject_Free(tc->prv); tc->prv = NULL; } } @@ -2216,16 +2212,6 @@ PyObject *objToJSON(PyObject *Py_UNUSED(self), PyObject *args, pyEncoder.datetimeUnit = NPY_FR_ms; pyEncoder.outputFormat = COLUMNS; pyEncoder.defaultHandler = 0; - pyEncoder.basicTypeContext.newObj = NULL; - pyEncoder.basicTypeContext.dictObj = NULL; - pyEncoder.basicTypeContext.itemValue = NULL; - pyEncoder.basicTypeContext.itemName = NULL; - pyEncoder.basicTypeContext.attrList = NULL; - pyEncoder.basicTypeContext.iterator = NULL; - pyEncoder.basicTypeContext.cStr = NULL; - pyEncoder.basicTypeContext.npyarr = NULL; - pyEncoder.basicTypeContext.rowLabels = NULL; - pyEncoder.basicTypeContext.columnLabels = NULL; PRINTMARK(); From 1c16f8890135d2e37aa1ec963ae9d93c7637a731 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Fri, 31 Jan 2020 09:54:03 -0800 Subject: [PATCH 2/2] spaces --- pandas/_libs/src/ujson/python/objToJSON.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/_libs/src/ujson/python/objToJSON.c b/pandas/_libs/src/ujson/python/objToJSON.c index 1a39a40dd67f8..d04e873fff7bd 100644 --- a/pandas/_libs/src/ujson/python/objToJSON.c +++ b/pandas/_libs/src/ujson/python/objToJSON.c @@ -2114,7 +2114,7 @@ void Object_endTypeContext(JSOBJ Py_UNUSED(obj), JSONTypeContext *tc) { PyObject_Free(GET_TC(tc)->cStr); GET_TC(tc)->cStr = NULL; - PyObject_Free(tc->prv); + PyObject_Free(tc->prv); tc->prv = NULL; } }