remove Py_UnbufferedStdioFlag

python · picnixz · May 8, 2025 · May 8, 2025 · May 8, 2025 · May 8, 2025
commit c66edb3056be3b1ea800aea9247cc50ed7a5f462
diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
@@ -177,20 +177,6 @@ to 1 and ``-bb`` sets :c:data:`Py_BytesWarningFlag` to 2.
   .. deprecated-removed:: 3.12 3.15


-.. c:var:: int Py_UnbufferedStdioFlag
-
-   This API is kept for backward compatibility: setting
-   :c:member:`PyConfig.buffered_stdio` should be used instead, see :ref:`Python
-   Initialization Configuration <init-config>`.
-
-   Force the stdout and stderr streams to be unbuffered.
-
-   Set by the :option:`-u` option and the :envvar:`PYTHONUNBUFFERED`
-   environment variable.
-
-   .. deprecated-removed:: 3.12 3.15
-
-
 Initializing and finalizing the interpreter
 ===========================================


diff --git a/Doc/deprecations/c-api-pending-removal-in-3.15.rst b/Doc/deprecations/c-api-pending-removal-in-3.15.rst
@@ -71,9 +71,6 @@ Pending removal in Python 3.15
  * :c:var:`Py_InteractiveFlag`:
    Use :c:member:`PyConfig.interactive` or
    :c:func:`PyConfig_Get("interactive") <PyConfig_Get>` instead.
-  * :c:var:`Py_UnbufferedStdioFlag`:
-    Use :c:member:`PyConfig.buffered_stdio` or
-    :c:func:`PyConfig_Get("buffered_stdio") <PyConfig_Get>` instead.
  * :c:var:`Py_HashRandomizationFlag`:
    Use :c:member:`PyConfig.use_hash_seed`
    and :c:member:`PyConfig.hash_seed` or

diff --git a/Include/cpython/pydebug.h b/Include/cpython/pydebug.h
@@ -6,7 +6,6 @@ extern "C" {
 #endif

 Py_DEPRECATED(3.12) PyAPI_DATA(int) Py_InteractiveFlag;
-Py_DEPRECATED(3.12) PyAPI_DATA(int) Py_UnbufferedStdioFlag;
 Py_DEPRECATED(3.12) PyAPI_DATA(int) Py_HashRandomizationFlag;
 Py_DEPRECATED(3.12) PyAPI_DATA(int) Py_IsolatedFlag;


diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
@@ -704,7 +704,6 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
        ('Py_FileSystemDefaultEncoding', 'filesystem_encoding'),
        ('Py_InteractiveFlag', 'interactive'),
        ('Py_IsolatedFlag', 'isolated'),
-        ('Py_UnbufferedStdioFlag', 'buffered_stdio', True),
    ]
    if MS_WINDOWS:
        COPY_GLOBAL_PRE_CONFIG.extend((

diff --git a/Programs/_testembed.c b/Programs/_testembed.c
@@ -582,7 +582,6 @@ static int test_init_global_config(void)
    putenv("PYTHONVERBOSE=0");

    putenv("PYTHONUNBUFFERED=");
-    Py_UnbufferedStdioFlag = 1;

    /* FIXME: test Py_LegacyWindowsFSEncodingFlag */
    /* FIXME: test Py_LegacyWindowsStdioFlag */
@@ -712,7 +711,6 @@ static int test_init_from_config(void)
    config.configure_c_stdio = 1;

    putenv("PYTHONUNBUFFERED=");
-    Py_UnbufferedStdioFlag = 0;
    config.buffered_stdio = 0;

    putenv("PYTHONIOENCODING=cp424");
@@ -1025,7 +1023,6 @@ static void set_all_global_config_variables(void)
 {
    Py_IsolatedFlag = 0;
    Py_InteractiveFlag = 1;
-    Py_UnbufferedStdioFlag = 1;
 #ifdef MS_WINDOWS
    Py_LegacyWindowsStdioFlag = 1;
 #endif
@@ -1090,7 +1087,6 @@ static int check_init_python_config(int preinit)
    /* global configuration variables must be ignored */
    set_all_global_config_variables();
    Py_IsolatedFlag = 1;
-    Py_UnbufferedStdioFlag = 1;
 #ifdef MS_WINDOWS
    Py_LegacyWindowsStdioFlag = 1;
 #endif

diff --git a/Python/initconfig.c b/Python/initconfig.c
@@ -463,7 +463,6 @@ static const char usage_envvars[] =
   stdin and stdout error handler to "surrogateescape". */
 int Py_UTF8Mode = 0;
 int Py_InteractiveFlag = 0; /* Previously, was used by Py_FdIsInteractive() */
-int Py_UnbufferedStdioFlag = 0; /* Unbuffered binary std{in,out,err} */
 int Py_HashRandomizationFlag = 0; /* for -R and PYTHONHASHSEED */
 int Py_IsolatedFlag = 0; /* for -I, isolate from user's env */
 #ifdef MS_WINDOWS
@@ -513,7 +512,6 @@ _Py_COMP_DIAG_IGNORE_DEPR_DECLS
    SET_ITEM_INT(Py_UTF8Mode);
    SET_ITEM_INT(Py_InteractiveFlag);

-    SET_ITEM_INT(Py_UnbufferedStdioFlag);
    SET_ITEM_INT(Py_HashRandomizationFlag);
    SET_ITEM_INT(Py_IsolatedFlag);

@@ -1016,7 +1014,7 @@ _PyConfig_InitCompatConfig(PyConfig *config)
    config->quiet = 0;
    config->user_site_directory = 1;
    config->configure_c_stdio = 0;
-    config->buffered_stdio = -1;
+    config->buffered_stdio = 1;
    config->_install_importlib = 1;
    config->check_hash_pycs_mode = NULL;
    config->pathconfig_warnings = 1;
@@ -1665,8 +1663,6 @@ _Py_COMP_DIAG_IGNORE_DEPR_DECLS
    COPY_FLAG(legacy_windows_stdio, Py_LegacyWindowsStdioFlag);
 #endif

-    COPY_NOT_FLAG(buffered_stdio, Py_UnbufferedStdioFlag);
-
 #undef COPY_FLAG
 #undef COPY_NOT_FLAG
 _Py_COMP_DIAG_POP
@@ -1694,8 +1690,6 @@ _Py_COMP_DIAG_IGNORE_DEPR_DECLS
    COPY_FLAG(legacy_windows_stdio, Py_LegacyWindowsStdioFlag);
 #endif

-    COPY_NOT_FLAG(buffered_stdio, Py_UnbufferedStdioFlag);
-
    /* Random or non-zero hash seed */
    Py_HashRandomizationFlag = (config->use_hash_seed == 0 ||
                                config->hash_seed != 0);

diff --git a/Tools/c-analyzer/cpython/ignored.tsv b/Tools/c-analyzer/cpython/ignored.tsv
@@ -110,7 +110,6 @@ Python/preconfig.c	-	_Py_HasFileSystemDefaultEncodeErrors	-
 ## legacy config flags
 Python/initconfig.c	-	Py_UTF8Mode	-
 Python/initconfig.c	-	Py_InteractiveFlag	-
-Python/initconfig.c	-	Py_UnbufferedStdioFlag	-
 Python/initconfig.c	-	Py_HashRandomizationFlag	-
 Python/initconfig.c	-	Py_IsolatedFlag	-
 Python/initconfig.c	-	Py_LegacyWindowsFSEncodingFlag	-