@@ -62,10 +62,6 @@ npy_int64 get_nat(void) { return NPY_MIN_INT64; }
62
62
typedef void * (* PFN_PyTypeToJSON )(JSOBJ obj , JSONTypeContext * ti ,
63
63
void * outValue , size_t * _outLen );
64
64
65
- #if (PY_VERSION_HEX < 0x02050000 )
66
- typedef ssize_t Py_ssize_t ;
67
- #endif
68
-
69
65
typedef struct __NpyArrContext {
70
66
PyObject * array ;
71
67
char * dataptr ;
@@ -153,12 +149,7 @@ enum PANDAS_FORMAT { SPLIT, RECORDS, INDEX, COLUMNS, VALUES };
153
149
154
150
int PdBlock_iterNext (JSOBJ , JSONTypeContext * );
155
151
156
- // import_array() compat
157
- #if (PY_VERSION_HEX >= 0x03000000 )
158
152
void * initObjToJSON (void )
159
- #else
160
- void initObjToJSON (void )
161
- #endif
162
153
{
163
154
PyObject * mod_pandas ;
164
155
PyObject * mod_nattype ;
@@ -426,14 +417,12 @@ static void *PyUnicodeToUTF8(JSOBJ _obj, JSONTypeContext *tc, void *outValue,
426
417
PyObject * obj , * newObj ;
427
418
obj = (PyObject * )_obj ;
428
419
429
- #if (PY_VERSION_HEX >= 0x03030000 )
430
420
if (PyUnicode_IS_COMPACT_ASCII (obj )) {
431
421
Py_ssize_t len ;
432
422
char * data = (char * )PyUnicode_AsUTF8AndSize (obj , & len );
433
423
* _outLen = len ;
434
424
return data ;
435
425
}
436
- #endif
437
426
438
427
newObj = PyUnicode_AsUTF8String (obj );
439
428
@@ -720,15 +709,7 @@ int NpyArr_iterNextItem(JSOBJ obj, JSONTypeContext *tc) {
720
709
721
710
NpyArr_freeItemValue (obj , tc );
722
711
723
- #if NPY_API_VERSION < 0x00000007
724
- if (PyArray_ISDATETIME (npyarr -> array )) {
725
- PRINTMARK ();
726
- GET_TC (tc )
727
- -> itemValue = PyArray_ToScalar (npyarr -> dataptr , npyarr -> array );
728
- } else if (PyArray_ISNUMBER (npyarr -> array )) // NOLINT
729
- #else
730
- if (PyArray_ISNUMBER (npyarr -> array ) || PyArray_ISDATETIME (npyarr -> array )) // NOLINT
731
- #endif
712
+ if (PyArray_ISNUMBER (npyarr -> array ) || PyArray_ISDATETIME (npyarr -> array ))
732
713
{
733
714
PRINTMARK ();
734
715
GET_TC (tc )-> itemValue = obj ;
@@ -1619,13 +1600,7 @@ char **NpyArr_encodeLabels(PyArrayObject *labels, JSONObjectEncoder *enc,
1619
1600
type_num = PyArray_TYPE (labels );
1620
1601
1621
1602
for (i = 0 ; i < num ; i ++ ) {
1622
- #if NPY_API_VERSION < 0x00000007
1623
- if (PyTypeNum_ISDATETIME (type_num )) {
1624
- item = PyArray_ToScalar (dataptr , labels );
1625
- } else if (PyTypeNum_ISNUMBER (type_num )) // NOLINT
1626
- #else
1627
- if (PyTypeNum_ISDATETIME (type_num ) || PyTypeNum_ISNUMBER (type_num )) // NOLINT
1628
- #endif
1603
+ if (PyTypeNum_ISDATETIME (type_num ) || PyTypeNum_ISNUMBER (type_num ))
1629
1604
{
1630
1605
item = (PyObject * )labels ;
1631
1606
pyenc -> npyType = type_num ;
0 commit comments