Drop support for TimeZoneType in datetime C API

Author: pganssle

Doc/c-api/datetime.rst

@@ -75,18 +75,6 @@ Type-check macros:
    *NULL*.
 
 
-.. c:function:: int PyTimeZone_Check(PyObject *ob)
-
-   Return true if *ob* is of type :c:data:`PyDateTime_TimeZoneType` or a subtype of
-   :c:data:`PyDateTime_TimeZoneType`.  *ob* must not be *NULL*.
-
-
-.. c:function:: int PyTimeZone_CheckExact(PyObject *ob)
-
-   Return true if *ob* is of type :c:data:`PyDateTime_TimeZoneType`. *ob* must not be
-   *NULL*.
-
-
 Macros to create objects:
 
 .. c:function:: PyObject* PyDate_FromDate(int year, int month, int day)

Include/datetime.h

@@ -154,7 +154,6 @@ typedef struct {
     PyTypeObject *TimeType;
     PyTypeObject *DeltaType;
     PyTypeObject *TZInfoType;
-    PyTypeObject *TimeZoneType;
 
     /* singletons */
     PyObject *TimeZone_UTC;
@@ -199,9 +198,6 @@ typedef struct {
 #define PyTZInfo_Check(op) PyObject_TypeCheck(op, &PyDateTime_TZInfoType)
 #define PyTZInfo_CheckExact(op) (Py_TYPE(op) == &PyDateTime_TZInfoType)
 
-#define PyTimeZone_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->TimeZoneType)
-#define PyTimeZone_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->TimeZoneType)
-
 #else
 
 /* Define global variable for the C API and a macro for setting it. */
@@ -226,10 +222,6 @@ static PyDateTime_CAPI *PyDateTimeAPI = NULL;
 #define PyTZInfo_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->TZInfoType)
 #define PyTZInfo_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->TZInfoType)
 
-#define PyTimeZone_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->TimeZoneType)
-#define PyTimeZone_CheckExact(op) (Py_TYPE(op) == PyDateTimeAPI->TimeZoneType)
-
-
 /* Macros for accessing constructors in a simplified fashion. */
 #define PyDate_FromDate(year, month, day) \
     PyDateTimeAPI->Date_FromDate(year, month, day, PyDateTimeAPI->DateType)

Lib/test/datetimetester.py

@@ -5622,24 +5622,6 @@ class TZInfoSubclass(tzinfo):
                 with self.subTest(arg=arg, exact=exact):
                     self.assertFalse(is_tzinfo(arg, exact))
 
-    def test_check_timezone(self):
-        tz = timezone(timedelta(hours=-5))
-
-        is_timezone = _testcapi.datetime_check_timezone
-
-        # Check the ones that should be valid
-        self.assertTrue(is_timezone(tz))
-        self.assertTrue(is_timezone(tz, True))
-
-        # Check that various other things are not time zones
-        args = [tuple(), list(), 1, '2011-01-01', tzinfo(),
-                date(2011, 1, 1), datetime(2011, 1, 1)]
-
-        for arg in args:
-            for exact in (True, False):
-                with self.subTest(arg=arg, exact=exact):
-                    self.assertFalse(is_timezone(arg, exact))
-
 def load_tests(loader, standard_tests, pattern):
     standard_tests.addTest(ZoneInfoCompleteTest())
     return standard_tests

Modules/_datetimemodule.c

@@ -6036,7 +6036,6 @@ static PyDateTime_CAPI CAPI = {
     &PyDateTime_TimeType,
     &PyDateTime_DeltaType,
     &PyDateTime_TZInfoType,
-    &PyDateTime_TimeZoneType,
     NULL,                       // PyDatetime_TimeZone_UTC not initialized yet
     new_date_ex,
     new_datetime_ex,

Modules/_testcapimodule.c

@@ -2266,10 +2266,6 @@ datetime_check_tzinfo(PyObject *self, PyObject *args) {
     MAKE_DATETIME_CHECK_FUNC(PyTZInfo_Check, PyTZInfo_CheckExact)
 }
 
-static PyObject *
-datetime_check_timezone(PyObject *self, PyObject *args) {
-    MAKE_DATETIME_CHECK_FUNC(PyTimeZone_Check, PyTimeZone_CheckExact)
-}
 
 /* Makes three variations on timezone representing UTC-5:
    1. timezone with offset and name from PyDateTimeAPI
@@ -4526,7 +4522,6 @@ static PyMethodDef TestMethods[] = {
     {"datetime_check_datetime",     datetime_check_datetime,     METH_VARARGS},
     {"datetime_check_delta",     datetime_check_delta,           METH_VARARGS},
     {"datetime_check_tzinfo",     datetime_check_tzinfo,         METH_VARARGS},
-    {"datetime_check_timezone",     datetime_check_timezone,     METH_VARARGS},
     {"make_timezones_capi",     make_timezones_capi,             METH_NOARGS},
     {"get_timezone_utc_capi",    get_timezone_utc_capi,            METH_NOARGS},
     {"test_list_api",           (PyCFunction)test_list_api,      METH_NOARGS},