moved lots

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

@@ -47,8 +47,8 @@ Numeric decoder derived from TCL library
 #include <numpy/ndarraytypes.h>
 #include <numpy/npy_math.h>
 #include <ultrajson.h>
-#include "date_conversions.h"
 #include "datetime.h"
+#include "pd_datetime.h"
 
 npy_int64 get_nat(void) { return NPY_MIN_INT64; }
 
@@ -1977,6 +1977,11 @@ PyObject *objToJSON(PyObject *Py_UNUSED(self), PyObject *args,
  return NULL;
  }
 
+ PandasDateTime_IMPORT;
+ if (PandasDateTimeAPI == NULL) {
+ return NULL;
+ } 
+
  static char *kwlist[] = {"obj",
  "ensure_ascii",
  "double_precision",

pandas/_libs/tslibs/np_datetime.pxd

@@ -55,7 +55,7 @@ cdef extern from "numpy/ndarraytypes.h":
  int64_t NPY_DATETIME_NAT # elswhere we call this NPY_NAT
 
 
-cdef extern from "src/datetime/np_datetime.h":
+cdef extern from "src/datetime/pd_datetime.h":
  ctypedef struct pandas_timedeltastruct:
  int64_t days
  int32_t hrs, min, sec, ms, us, ns, seconds, microseconds, nanoseconds
@@ -68,13 +68,17 @@ cdef extern from "src/datetime/np_datetime.h":
  pandas_timedeltastruct *result
  ) nogil
 
-cdef extern from "src/datetime/pd_datetime.h":
  void PandasDateTime_IMPORT()
 
  void pandas_datetime_to_datetimestruct(npy_datetime val,
  NPY_DATETIMEUNIT fr,
  npy_datetimestruct *result) nogil
 
+ ctypedef enum FormatRequirement:
+ PARTIAL_MATCH
+ EXACT_MATCH
+ INFER_FORMAT
+
 # You must call this before using the PandasDateTime CAPI functions
 cdef inline void import_pandas_datetime():
  PandasDateTime_IMPORT
@@ -133,8 +137,3 @@ cdef int64_t convert_reso(
  bint round_ok,
 ) except? -1
 
-cdef extern from "src/datetime/np_datetime_strings.h":
- ctypedef enum FormatRequirement:
- PARTIAL_MATCH
- EXACT_MATCH
- INFER_FORMAT

pandas/_libs/tslibs/np_datetime.pyx

@@ -35,7 +35,7 @@ from numpy cimport (
 from pandas._libs.tslibs.util cimport get_c_string_buf_and_size
 
 
-cdef extern from "src/datetime/np_datetime.h":
+cdef extern from "src/datetime/pd_datetime.h":
  int cmp_npy_datetimestruct(npy_datetimestruct *a,
  npy_datetimestruct *b)
 
@@ -48,7 +48,6 @@ cdef extern from "src/datetime/np_datetime.h":
 
  PyArray_DatetimeMetaData get_datetime_metadata_from_dtype(cnp.PyArray_Descr *dtype)
 
-cdef extern from "src/datetime/np_datetime_strings.h":
  int parse_iso_8601_datetime(const char *str, int len, int want_exc,
  npy_datetimestruct *out,
  NPY_DATETIMEUNIT *out_bestunit,