CLN: Update cpython imports in Cython Code GH28382 (#28398)

Author: amunch

pandas/_libs/hashtable.pyx

@@ -1,7 +1,7 @@
 cimport cython
 
-from cpython cimport (PyObject, Py_INCREF,
-                      PyMem_Malloc, PyMem_Realloc, PyMem_Free)
+from cpython.ref cimport PyObject, Py_INCREF
+from cpython.mem cimport PyMem_Malloc, PyMem_Realloc, PyMem_Free
 
 from libc.stdlib cimport malloc, free
 

pandas/_libs/internals.pyx

@@ -1,7 +1,7 @@
 import cython
 from cython import Py_ssize_t
 
-from cpython cimport PyObject
+from cpython.object cimport PyObject
 
 cdef extern from "Python.h":
     Py_ssize_t PY_SSIZE_T_MAX

pandas/_libs/khash.pxd

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from cpython cimport PyObject
+from cpython.object cimport PyObject
 from numpy cimport int64_t, uint64_t, int32_t, uint32_t, float64_t
 
 cdef extern from "khash_python.h":

pandas/_libs/lib.pyx

@@ -9,9 +9,12 @@ import warnings
 import cython
 from cython import Py_ssize_t
 
-from cpython cimport (Py_INCREF, PyTuple_SET_ITEM, PyTuple_New, PyObject_Str,
-                      Py_EQ, Py_SIZE, PyObject_RichCompareBool,
-                      PyUnicode_Join, PyList_New)
+from cpython.list cimport PyList_New
+from cpython.object cimport (PyObject_Str, PyObject_RichCompareBool, Py_EQ,
+                             Py_SIZE)
+from cpython.ref cimport Py_INCREF
+from cpython.tuple cimport PyTuple_SET_ITEM, PyTuple_New
+from cpython.unicode cimport PyUnicode_Join
 
 from cpython.datetime cimport (PyDateTime_Check, PyDate_Check,
                                PyTime_Check, PyDelta_Check,

pandas/_libs/ops.pyx

@@ -1,7 +1,7 @@
 import operator
 
-from cpython cimport (PyObject_RichCompareBool,
-                      Py_EQ, Py_NE, Py_LT, Py_LE, Py_GT, Py_GE)
+from cpython.object cimport (PyObject_RichCompareBool,
+                             Py_EQ, Py_NE, Py_LT, Py_LE, Py_GT, Py_GE)
 
 import cython
 from cython import Py_ssize_t

pandas/_libs/parsers.pyx

@@ -17,12 +17,11 @@ from libc.string cimport strncpy, strlen, strcasecmp
 import cython
 from cython import Py_ssize_t
 
-from cpython cimport (PyObject, PyBytes_FromString,
-                      PyBytes_AsString,
-                      PyUnicode_AsUTF8String,
-                      PyErr_Occurred, PyErr_Fetch,
-                      PyUnicode_Decode)
+from cpython.bytes cimport PyBytes_AsString, PyBytes_FromString
+from cpython.exc cimport PyErr_Occurred, PyErr_Fetch
+from cpython.object cimport PyObject
 from cpython.ref cimport Py_XDECREF
+from cpython.unicode cimport PyUnicode_AsUTF8String, PyUnicode_Decode
 
 
 cdef extern from "Python.h":

pandas/_libs/properties.pyx

@@ -1,6 +1,6 @@
 from cython import Py_ssize_t
 
-from cpython cimport (
+from cpython.dict cimport (
     PyDict_Contains, PyDict_GetItem, PyDict_SetItem)
 
 

pandas/_libs/reduction.pyx

@@ -1,7 +1,7 @@
 from distutils.version import LooseVersion
 
 from cython import Py_ssize_t
-from cpython cimport Py_INCREF
+from cpython.ref cimport Py_INCREF
 
 from libc.stdlib cimport malloc, free
 

pandas/_libs/tslibs/c_timestamp.pyx

@@ -14,8 +14,8 @@ shadows the python class, where we do any heavy lifting.
 
 import warnings
 
-from cpython cimport (PyObject_RichCompareBool, PyObject_RichCompare,
-                      Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE)
+from cpython.object cimport (PyObject_RichCompareBool, PyObject_RichCompare,
+                             Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE)
 
 import numpy as np
 cimport numpy as cnp

pandas/_libs/tslibs/nattype.pyx

@@ -1,4 +1,4 @@
-from cpython cimport (
+from cpython.object cimport (
     PyObject_RichCompare,
     Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE)
 

pandas/_libs/tslibs/np_datetime.pyx

@@ -1,4 +1,4 @@
-from cpython cimport Py_EQ, Py_NE, Py_GE, Py_GT, Py_LT, Py_LE
+from cpython.object cimport Py_EQ, Py_NE, Py_GE, Py_GT, Py_LT, Py_LE
 
 from cpython.datetime cimport (datetime, date,
                                PyDateTime_IMPORT,

pandas/_libs/tslibs/parsing.pyx

@@ -10,7 +10,8 @@ from libc.string cimport strchr
 import cython
 from cython import Py_ssize_t
 
-from cpython cimport PyObject_Str, PyUnicode_Join
+from cpython.object cimport PyObject_Str
+from cpython.unicode cimport PyUnicode_Join
 
 from cpython.datetime cimport datetime, datetime_new, import_datetime
 from cpython.version cimport PY_VERSION_HEX

pandas/_libs/tslibs/period.pyx

@@ -1,6 +1,6 @@
 from datetime import datetime
 
-from cpython cimport (
+from cpython.object cimport (
     PyObject_RichCompareBool,
     Py_EQ, Py_NE)
 

pandas/_libs/tslibs/timedeltas.pyx

@@ -4,7 +4,7 @@ import warnings
 
 import cython
 
-from cpython cimport Py_NE, Py_EQ, PyObject_RichCompare
+from cpython.object cimport Py_NE, Py_EQ, PyObject_RichCompare
 
 import numpy as np
 cimport numpy as cnp

pandas/_libs/tslibs/util.pxd

@@ -1,5 +1,5 @@
 
-from cpython cimport PyTypeObject
+from cpython.object cimport PyTypeObject
 
 cdef extern from *:
     """

pandas/_libs/writers.pyx

@@ -1,7 +1,8 @@
 import cython
 from cython import Py_ssize_t
 
-from cpython cimport PyBytes_GET_SIZE, PyUnicode_GET_SIZE
+from cpython.bytes cimport PyBytes_GET_SIZE
+from cpython.unicode cimport PyUnicode_GET_SIZE
 
 import numpy as np
 from numpy cimport ndarray, uint8_t

pandas/io/msgpack/_packer.pyx

@@ -1,15 +1,17 @@
 # coding: utf-8
 # cython: embedsignature=True
 
-from cpython cimport (
-    PyFloat_Check, PyLong_Check, PyInt_Check,
-    PyDict_CheckExact, PyDict_Check,
-    PyTuple_Check, PyList_Check,
-    PyCallable_Check,
-    PyUnicode_Check, PyBytes_Check,
-    PyBytes_AsString,
-    PyBytes_FromStringAndSize,
-    PyUnicode_AsEncodedString)
+from cpython.bytes cimport (PyBytes_Check, PyBytes_AsString,
+                            PyBytes_FromStringAndSize)
+from cpython.dict cimport PyDict_Check, PyDict_CheckExact
+from cpython.float cimport PyFloat_Check
+from cpython.int cimport PyInt_Check
+from cpython.list cimport PyList_Check
+from cpython.long cimport PyLong_Check
+from cpython.object cimport PyCallable_Check
+from cpython.tuple cimport PyTuple_Check
+from cpython.unicode cimport PyUnicode_Check, PyUnicode_AsEncodedString
+
 from libc.stdlib cimport free, malloc
 
 from pandas.io.msgpack.exceptions import PackValueError

pandas/io/msgpack/_unpacker.pyx

@@ -3,12 +3,11 @@
 
 from cython cimport Py_ssize_t
 
-from cpython cimport (
-    PyCallable_Check,
-    PyBUF_SIMPLE, PyObject_GetBuffer, PyBuffer_Release, Py_buffer,
-    PyBytes_Size,
-    PyBytes_FromStringAndSize,
-    PyBytes_AsString)
+from cpython.buffer cimport (PyBUF_SIMPLE, PyObject_GetBuffer,
+                             PyBuffer_Release, Py_buffer)
+from cpython.bytes cimport (PyBytes_Size, PyBytes_AsString,
+                            PyBytes_FromStringAndSize)
+from cpython.object cimport PyCallable_Check
 
 cdef extern from "Python.h":
     ctypedef struct PyObject