pythongh-101819: Remove _PyWindowsConsoleIO_Type from the Windows DLL

erlend-aasland · Feb 14, 2023 · d6b80b8 · d6b80b8
1 parent e5da9ab
commit d6b80b8
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 13 deletions.
diff --git a/Include/internal/pycore_global_objects_fini_generated.h b/Include/internal/pycore_global_objects_fini_generated.h
diff --git a/Include/internal/pycore_global_strings.h b/Include/internal/pycore_global_strings.h
@@ -63,6 +63,7 @@ struct _Py_global_strings {
         STRUCT_FOR_ID(True)
         STRUCT_FOR_ID(WarningMessage)
         STRUCT_FOR_ID(_)
+        STRUCT_FOR_ID(_WindowsConsoleIO)
         STRUCT_FOR_ID(__IOBase_closed)
         STRUCT_FOR_ID(__abc_tpflags__)
         STRUCT_FOR_ID(__abs__)

diff --git a/Include/internal/pycore_runtime_init_generated.h b/Include/internal/pycore_runtime_init_generated.h
diff --git a/Include/internal/pycore_unicodeobject_generated.h b/Include/internal/pycore_unicodeobject_generated.h
diff --git a/Modules/_io/_iomodule.h b/Modules/_io/_iomodule.h
@@ -21,13 +21,9 @@ extern PyTypeObject PyBufferedRandom_Type;
 extern PyTypeObject PyTextIOWrapper_Type;
 extern PyTypeObject PyIncrementalNewlineDecoder_Type;
 
-#ifndef Py_LIMITED_API
 #ifdef MS_WINDOWS
 extern PyTypeObject PyWindowsConsoleIO_Type;
-PyAPI_DATA(PyObject *) _PyWindowsConsoleIO_Type;
-#define PyWindowsConsoleIO_Check(op) (PyObject_TypeCheck((op), (PyTypeObject*)_PyWindowsConsoleIO_Type))
-#endif /* MS_WINDOWS */
-#endif /* Py_LIMITED_API */
+#endif
 
 /* These functions are used as METH_NOARGS methods, are normally called
  * with args=NULL, and return a new reference.

diff --git a/Modules/_io/winconsoleio.c b/Modules/_io/winconsoleio.c
@@ -1174,6 +1174,4 @@ PyTypeObject PyWindowsConsoleIO_Type = {
     0,                                          /* tp_finalize */
 };
 
-PyObject * _PyWindowsConsoleIO_Type = (PyObject*)&PyWindowsConsoleIO_Type;
-
 #endif /* MS_WINDOWS */
diff --git a/PC/_testconsole.c b/PC/_testconsole.c
@@ -51,7 +51,14 @@ _testconsole_write_input_impl(PyObject *module, PyObject *file,
 {
     INPUT_RECORD *rec = NULL;
 
-    if (!PyWindowsConsoleIO_Check(file)) {
+    PyObject *winconsoleio_type = _PyImport_GetModuleAttr(
+            "_io", &_Py_ID(_WindowsConsoleIO));
+    if (winconsoleio_type == NULL) {
+        return NULL;
+    }
+    int is_subclass = PyObject_TypeCheck(raw, winconsoleio_type);
+    Py_DECREF(winconsoleio_type);
+    if (!is_subclass) {
         PyErr_SetString(PyExc_TypeError, "expected raw console object");
         return NULL;
     }

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -54,10 +54,6 @@ extern void _PyIO_Fini(void);
 
 #ifdef MS_WINDOWS
 #  undef BYTE
-
-   extern PyTypeObject PyWindowsConsoleIO_Type;
-#  define PyWindowsConsoleIO_Check(op) \
-       (PyObject_TypeCheck((op), &PyWindowsConsoleIO_Type))
 #endif
 
 #define PUTS(fd, str) _Py_write_noraise(fd, str, (int)strlen(str))
@@ -2358,8 +2354,16 @@ create_stdio(const PyConfig *config, PyObject* io,
 
 #ifdef MS_WINDOWS
     /* Windows console IO is always UTF-8 encoded */
-    if (PyWindowsConsoleIO_Check(raw))
+    PyObject *winconsoleio_type = _PyImport_GetModuleAttr(
+            "_io", &_Py_ID(_WindowsConsoleIO));
+    if (winconsoleio_type == NULL) {
+        goto error;
+    }
+    int is_subclass = PyObject_TypeCheck(raw, winconsoleio_type);
+    Py_DECREF(winconsoleio_type);
+    if (is_subclass) {
         encoding = L"utf-8";
+    }
 #endif
 
     text = PyUnicode_FromString(name);