Skip to content

Commit d75ee70

Browse files
authored
Remove Encoding of values in char** For Labels (#27618)
1 parent e2483c0 commit d75ee70

File tree

5 files changed

+250
-132
lines changed

5 files changed

+250
-132
lines changed

doc/source/whatsnew/v1.0.0.rst

+1
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ I/O
159159
^^^
160160

161161
- :meth:`read_csv` now accepts binary mode file buffers when using the Python csv engine (:issue:`23779`)
162+
- Bug in :meth:`DataFrame.to_json` where using a Tuple as a column or index value and using ``orient="columns"`` or ``orient="index"`` would produce invalid JSON (:issue:`20500`)
162163
-
163164

164165
Plotting

pandas/_libs/src/ujson/lib/ultrajson.h

-7
Original file line numberDiff line numberDiff line change
@@ -307,11 +307,4 @@ EXPORTFUNCTION JSOBJ JSON_DecodeObject(JSONObjectDecoder *dec,
307307
const char *buffer, size_t cbBuffer);
308308
EXPORTFUNCTION void encode(JSOBJ, JSONObjectEncoder *, const char *, size_t);
309309

310-
#define Buffer_Reserve(__enc, __len) \
311-
if ((size_t)((__enc)->end - (__enc)->offset) < (size_t)(__len)) { \
312-
Buffer_Realloc((__enc), (__len)); \
313-
}
314-
315-
void Buffer_Realloc(JSONObjectEncoder *enc, size_t cbNeeded);
316-
317310
#endif // PANDAS__LIBS_SRC_UJSON_LIB_ULTRAJSON_H_

pandas/_libs/src/ujson/lib/ultrajsonenc.c

+6
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,12 @@ int Buffer_EscapeStringValidated(JSOBJ obj, JSONObjectEncoder *enc,
714714
}
715715
}
716716

717+
#define Buffer_Reserve(__enc, __len) \
718+
if ( (size_t) ((__enc)->end - (__enc)->offset) < (size_t) (__len)) \
719+
{ \
720+
Buffer_Realloc((__enc), (__len));\
721+
} \
722+
717723
#define Buffer_AppendCharUnchecked(__enc, __chr) *((__enc)->offset++) = __chr;
718724

719725
FASTCALL_ATTR INLINE_PREFIX void FASTCALL_MSVC strreverse(char *begin,

0 commit comments

Comments
 (0)