From 516e7fe9a0c60afab7e2bb888c90acbdfd269404 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Sat, 7 Dec 2019 14:42:04 -0800 Subject: [PATCH] Removed is_sparse_array from objToJSON --- pandas/_libs/src/ujson/python/objToJSON.c | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/pandas/_libs/src/ujson/python/objToJSON.c b/pandas/_libs/src/ujson/python/objToJSON.c index 608504a668175..a2130fa004f02 100644 --- a/pandas/_libs/src/ujson/python/objToJSON.c +++ b/pandas/_libs/src/ujson/python/objToJSON.c @@ -212,27 +212,11 @@ static TypeContext *createTypeContext(void) { return pc; } -static int is_sparse_array(PyObject *obj) { - // TODO can be removed again once SparseArray.values is removed (GH26421) - if (PyObject_HasAttrString(obj, "_subtyp")) { - PyObject *_subtype = PyObject_GetAttrString(obj, "_subtyp"); - PyObject *sparse_array = PyUnicode_FromString("sparse_array"); - int ret = PyUnicode_Compare(_subtype, sparse_array); - - if (ret == 0) { - return 1; - } - } - return 0; -} - static PyObject *get_values(PyObject *obj) { PyObject *values = NULL; - if (!is_sparse_array(obj)) { - values = PyObject_GetAttrString(obj, "values"); - PRINTMARK(); - } + values = PyObject_GetAttrString(obj, "values"); + PRINTMARK(); if (values && !PyArray_CheckExact(values)) { @@ -240,8 +224,7 @@ static PyObject *get_values(PyObject *obj) { values = PyObject_CallMethod(values, "to_numpy", NULL); } - if (!is_sparse_array(values) && - PyObject_HasAttrString(values, "values")) { + if (PyObject_HasAttrString(values, "values")) { PyObject *subvals = get_values(values); PyErr_Clear(); PRINTMARK();