Skip to content

Dead JSON Code Cleanup #31509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 2, 2020
Merged

Dead JSON Code Cleanup #31509

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ff7fb9
Removed basicTypeContext
WillAyd Jan 31, 2020
1c16f88
spaces
WillAyd Jan 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions pandas/_libs/src/ujson/python/objToJSON.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}
Expand Down Expand Up @@ -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();

Expand Down