Skip to content

Commit 087df67

Browse files
committed
Renamed JSON to UTF8
1 parent 946633e commit 087df67

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

pandas/_libs/src/ujson/python/objToJSON.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ PyObject *cls_timedelta;
5959

6060
npy_int64 get_nat(void) { return NPY_MIN_INT64; }
6161

62-
typedef void *(*PFN_PyTypeToJSON)(JSOBJ obj, JSONTypeContext *ti,
62+
typedef char *(*PFN_PyTypeToUTF8)(JSOBJ obj, JSONTypeContext *ti,
6363
void *outValue, size_t *_outLen);
6464

6565
typedef struct __NpyArrContext {
@@ -94,7 +94,7 @@ typedef struct __TypeContext {
9494
JSPFN_ITERNEXT iterNext;
9595
JSPFN_ITERGETNAME iterGetName;
9696
JSPFN_ITERGETVALUE iterGetValue;
97-
PFN_PyTypeToJSON PyTypeToJSON;
97+
PFN_PyTypeToUTF8 PyTypeToUTF8;
9898
PyObject *newObj;
9999
PyObject *dictObj;
100100
Py_ssize_t index;
@@ -1724,7 +1724,7 @@ void Object_beginTypeContext(JSOBJ _obj, JSONTypeContext *tc) {
17241724

17251725
if (enc->datetimeIso) {
17261726
PRINTMARK();
1727-
pc->PyTypeToJSON = NpyDateTimeToIso;
1727+
pc->PyTypeToUTF8 = NpyDateTimeToIso;
17281728
// Currently no way to pass longVal to iso function, so use
17291729
// state management
17301730
GET_TC(tc)->longValue = longVal;
@@ -1776,12 +1776,12 @@ void Object_beginTypeContext(JSOBJ _obj, JSONTypeContext *tc) {
17761776
return;
17771777
} else if (PyBytes_Check(obj)) {
17781778
PRINTMARK();
1779-
pc->PyTypeToJSON = PyBytesToUTF8;
1779+
pc->PyTypeToUTF8 = PyBytesToUTF8;
17801780
tc->type = JT_UTF8;
17811781
return;
17821782
} else if (PyUnicode_Check(obj)) {
17831783
PRINTMARK();
1784-
pc->PyTypeToJSON = PyUnicodeToUTF8;
1784+
pc->PyTypeToUTF8 = PyUnicodeToUTF8;
17851785
tc->type = JT_UTF8;
17861786
return;
17871787
} else if (PyObject_TypeCheck(obj, type_decimal)) {
@@ -1799,7 +1799,7 @@ void Object_beginTypeContext(JSOBJ _obj, JSONTypeContext *tc) {
17991799
PRINTMARK();
18001800
if (enc->datetimeIso) {
18011801
PRINTMARK();
1802-
pc->PyTypeToJSON = PyDateTimeToIso;
1802+
pc->PyTypeToUTF8 = PyDateTimeToIso;
18031803
tc->type = JT_UTF8;
18041804
} else {
18051805
PRINTMARK();
@@ -1811,7 +1811,7 @@ void Object_beginTypeContext(JSOBJ _obj, JSONTypeContext *tc) {
18111811
return;
18121812
} else if (PyTime_Check(obj)) {
18131813
PRINTMARK();
1814-
pc->PyTypeToJSON = PyTimeToJSON;
1814+
pc->PyTypeToUTF8 = PyTimeToJSON;
18151815
tc->type = JT_UTF8;
18161816
return;
18171817
} else if (PyArray_IsScalar(obj, Datetime)) {
@@ -1825,7 +1825,7 @@ void Object_beginTypeContext(JSOBJ _obj, JSONTypeContext *tc) {
18251825
PRINTMARK();
18261826
if (enc->datetimeIso) {
18271827
PRINTMARK();
1828-
pc->PyTypeToJSON = PyDateTimeToIso;
1828+
pc->PyTypeToUTF8 = PyDateTimeToIso;
18291829
tc->type = JT_UTF8;
18301830
} else {
18311831
PRINTMARK();
@@ -2235,7 +2235,7 @@ void Object_endTypeContext(JSOBJ obj, JSONTypeContext *tc) {
22352235

22362236
const char *Object_getStringValue(JSOBJ obj, JSONTypeContext *tc,
22372237
size_t *_outLen) {
2238-
return GET_TC(tc)->PyTypeToJSON(obj, tc, NULL, _outLen);
2238+
return GET_TC(tc)->PyTypeToUTF8(obj, tc, NULL, _outLen);
22392239
}
22402240

22412241
JSINT64 Object_getLongValue(JSOBJ obj, JSONTypeContext *tc) {

0 commit comments

Comments
 (0)