Drop _Py_IsDevelopmentEnv().

Author: ericsnowcurrently

Include/internal/pycore_pylifecycle.h

@@ -124,7 +124,6 @@ PyAPI_FUNC(PyStatus) _Py_PreInitializeFromConfig(
     const struct _PyArgv *args);
 
 PyAPI_FUNC(const wchar_t *) _Py_GetStdlibDir(const PyConfig *);
-PyAPI_FUNC(bool) _Py_IsDevelopmentEnv(const PyConfig *);
 
 PyAPI_FUNC(int) _Py_HandleSystemExit(int *exitcode_p);
 

Misc/NEWS.d/next/Core and Builtins/2021-08-31-17-44-51.bpo-45020.ZPI_3L.rst

@@ -1,5 +1,4 @@
 Freeze all the modules that are imported during Python startup.  This gives
 us meaningful performance improvements to startup.  Also add a new command
 line option, "-X frozen_modules=[on|off]" to opt out of (or into) using
-frozen modules.  This defaults to "on" (or "off" if running in a local
-development environment, saving contributors some frustration).
+frozen modules.  This defaults to "on".

Python/initconfig.c

@@ -2127,7 +2127,9 @@ _PyConfig_InitImportConfig(PyConfig *config)
     /* -X frozen_modules=[on|off] */
     const wchar_t *value = config_get_xoption_value(config, L"frozen_modules");
     if (value == NULL) {
-        config->use_frozen_modules = !_Py_IsDevelopmentEnv(config);
+        // Use a meaningful default.
+        // XXX Add the logic.
+        config->use_frozen_modules = false;
     }
     else if (wcscmp(value, L"on") == 0) {
         config->use_frozen_modules = true;

Python/pathconfig.c

@@ -8,7 +8,6 @@
 #include "pycore_pymem.h"         // _PyMem_SetDefaultAllocator()
 #include "pycore_pystate.h"       // _Py_GetMainConfig()
 #include <wchar.h>
-#include <stdbool.h>
 #ifdef MS_WINDOWS
 #  include <windows.h>            // GetFullPathNameW(), MAX_PATH
 #endif
@@ -37,17 +36,6 @@ copy_wstr(wchar_t **dst, const wchar_t *src)
     return 0;
 }
 
-static size_t
-find_basename(const wchar_t *filename)
-{
-    for (size_t i = wcslen(filename); i > 0; --i) {
-        if (filename[i] == SEP) {
-            return i + 1;
-        }
-    }
-    return 0;
-}
-
 
 static void
 pathconfig_clear(_PyPathConfig *config)
@@ -659,50 +647,6 @@ Py_GetProgramName(void)
 }
 
 
-static const wchar_t *
-get_executable(const PyConfig *fallback)
-{
-    const wchar_t *executable = Py_GetProgramFullPath();
-    if (executable != NULL) {
-        return executable;
-    }
-    if (fallback == NULL) {
-        fallback = _Py_GetMainConfig();
-        if (fallback == NULL) {
-            return NULL;
-        }
-    }
-    return fallback->executable;
-}
-
-bool
-_Py_IsDevelopmentEnv(const PyConfig *fallback)
-{
-    const wchar_t *executable = get_executable(fallback);
-    if (executable == NULL) {
-        return false;
-    }
-    size_t len = find_basename(executable);
-    if (wcscmp(executable + len, L"python") != 0) {
-        if (wcscmp(executable + len, L"python.exe") != 0) {
-            return false;
-        }
-    }
-    /* If dirname() is the same for both then it is a local (dev) build. */
-    const wchar_t *stdlib = _Py_GetStdlibDir(fallback);
-    if (stdlib == NULL) {
-        return false;
-    }
-    if (len != find_basename(stdlib)) {
-        return false;
-    }
-    if (wcsncmp(stdlib, executable, len) != 0) {
-        return false;
-    }
-    return true;
-}
-
-
 /* Compute module search path from argv[0] or the current working
    directory ("-m module" case) which will be prepended to sys.argv:
    sys.path[0].