Undo addition to PyConfig to ease backporting.

Release branches MUST NOT have `struct PyConfig` change.  Doing it this
way initially for 3.12 simplifies the backporting process.  This commit
is intended to be reverted in 3.12 after this lands in older releases.

Author: gpshead

Doc/c-api/init_config.rst

@@ -828,18 +828,6 @@ PyConfig
 
       Default: ``0``.
 
-   .. c:member:: int int_max_str_digits
-
-      If greater than 0, enable int conversion digit limitations. ``-1`` means
-      that :data:`sys.int_info.default_max_str_digits` will be used.
-
-      Configured by the :option:`-X int_max_str_digits <-X>` command line
-      flag or the :envvar:`PYTHONINTMAXSTRDIGITS` environment varable.
-
-      Default: ``-1``.
-
-      .. versionadded:: 3.12
-
    .. c:member:: int isolated
 
       If greater than ``0``, enable isolated mode:

Include/cpython/initconfig.h

@@ -178,7 +178,6 @@ typedef struct PyConfig {
     wchar_t *check_hash_pycs_mode;
     int use_frozen_modules;
     int safe_path;
-    int int_max_str_digits;  // NOTE(gpshead): do not backport to stable releases due to struct change.
 
     /* --- Path configuration inputs ------------ */
     int pathconfig_warnings;

Include/internal/pycore_initconfig.h

@@ -170,6 +170,8 @@ extern void _Py_DumpPathConfig(PyThreadState *tstate);
 
 PyAPI_FUNC(PyObject*) _Py_Get_Getpath_CodeObject(void);
 
+extern int _Py_global_config_int_max_str_digits;  // TODO(gpshead): move this into PyConfig in 3.12 after the backports ship.
+
 
 /* --- Function used for testing ---------------------------------- */
 

Lib/test/test_embed.py

@@ -434,7 +434,6 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
         'install_signal_handlers': 1,
         'use_hash_seed': 0,
         'hash_seed': 0,
-        'int_max_str_digits': -1,
         'faulthandler': 0,
         'tracemalloc': 0,
         'perf_profiling': 0,

Objects/longobject.c

@@ -6179,7 +6179,7 @@ _PyLong_InitTypes(PyInterpreterState *interp)
             return _PyStatus_ERR("can't init int info type");
         }
     }
-    interp->int_max_str_digits = _PyInterpreterState_GetConfig(interp)->int_max_str_digits;
+    interp->int_max_str_digits = _Py_global_config_int_max_str_digits;
     if (interp->int_max_str_digits == -1) {
         interp->int_max_str_digits = _PY_LONG_DEFAULT_MAX_STR_DIGITS;
     }

Python/initconfig.c

@@ -791,10 +791,12 @@ _PyConfig_InitCompatConfig(PyConfig *config)
     config->safe_path = 0;
     config->_is_python_build = 0;
     config->code_debug_ranges = 1;
-    /* config_init_int_max_str_digits() sets default limit */
-    config->int_max_str_digits = -1;
 }
 
+/* Excluded from public struct PyConfig for backporting reasons. */
+/* default to unconfigured, _PyLong_InitTypes() does the rest */
+int _Py_global_config_int_max_str_digits = -1;
+
 
 static void
 config_init_defaults(PyConfig *config)
@@ -1019,7 +1021,6 @@ _PyConfig_Copy(PyConfig *config, const PyConfig *config2)
     COPY_ATTR(safe_path);
     COPY_WSTRLIST(orig_argv);
     COPY_ATTR(_is_python_build);
-    COPY_ATTR(int_max_str_digits);
 
 #undef COPY_ATTR
 #undef COPY_WSTR_ATTR
@@ -1127,7 +1128,6 @@ _PyConfig_AsDict(const PyConfig *config)
     SET_ITEM_INT(use_frozen_modules);
     SET_ITEM_INT(safe_path);
     SET_ITEM_INT(_is_python_build);
-    SET_ITEM_INT(int_max_str_digits);
 
     return dict;
 
@@ -1781,9 +1781,6 @@ config_init_int_max_str_digits(PyConfig *config)
     int maxdigits;
     int valid = 0;
 
-    /* default to unconfigured, _PyLong_InitTypes() does the rest */
-    config->int_max_str_digits = -1;
-
     const char *env = config_get_env(config, "PYTHONINTMAXSTRDIGITS");
     if (env) {
         if (!_Py_str_to_int(env, &maxdigits)) {
@@ -1797,7 +1794,7 @@ config_init_int_max_str_digits(PyConfig *config)
                     STRINGIFY(_PY_LONG_MAX_STR_DIGITS_THRESHOLD)
                     " or 0 for unlimited.");
         }
-        config->int_max_str_digits = maxdigits;
+        _Py_global_config_int_max_str_digits = maxdigits;
     }
 
     const wchar_t *xoption = config_get_xoption(config, L"int_max_str_digits");
@@ -1816,7 +1813,7 @@ config_init_int_max_str_digits(PyConfig *config)
 #undef _STRINGIFY
 #undef STRINGIFY
         }
-        config->int_max_str_digits = maxdigits;
+        _Py_global_config_int_max_str_digits = maxdigits;
     }
     return _PyStatus_OK();
 }
@@ -1884,7 +1881,7 @@ config_read_complex_options(PyConfig *config)
         }
     }
 
-    if (config->int_max_str_digits < 0) {
+    if (_Py_global_config_int_max_str_digits < 0) {
         status = config_init_int_max_str_digits(config);
         if (_PyStatus_EXCEPTION(status)) {
             return status;

Python/sysmodule.c

@@ -2777,7 +2777,7 @@ set_flags_from_config(PyInterpreterState *interp, PyObject *flags)
     SetFlag(preconfig->utf8_mode);
     SetFlag(config->warn_default_encoding);
     SetFlagObj(PyBool_FromLong(config->safe_path));
-    SetFlag(config->int_max_str_digits);
+    SetFlag(_Py_global_config_int_max_str_digits);
 #undef SetFlagObj
 #undef SetFlag
     return 0;