From 49c4abbf201729a010899d2d99e62014a5b9ec13 Mon Sep 17 00:00:00 2001
From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Thu, 24 Apr 2025 16:53:52 -0600
Subject: [PATCH 1/6] Add _PyCode_GetScriptXIData().

---
 Include/internal/pycore_crossinterp.h |  4 ++
 Lib/test/_code_definitions.py         | 48 +++++++++++++
 Lib/test/test_code.py                 | 27 ++++++++
 Lib/test/test_crossinterp.py          | 91 ++++++++++++++++++++++++
 Modules/_testinternalcapi.c           |  5 ++
 Python/crossinterp.c                  | 99 +++++++++++++++++++++++++++
 6 files changed, 274 insertions(+)

diff --git a/Include/internal/pycore_crossinterp.h b/Include/internal/pycore_crossinterp.h
index 9de61ef54125d5..f6e30a9b19dcf6 100644
--- a/Include/internal/pycore_crossinterp.h
+++ b/Include/internal/pycore_crossinterp.h
@@ -191,6 +191,10 @@ PyAPI_FUNC(int) _PyCode_GetXIData(
         PyThreadState *,
         PyObject *,
         _PyXIData_t *);
+PyAPI_FUNC(int) _PyCode_GetScriptXIData(
+        PyThreadState *,
+        PyObject *,
+        _PyXIData_t *);
 
 
 /* using cross-interpreter data */
diff --git a/Lib/test/_code_definitions.py b/Lib/test/_code_definitions.py
index d64ac45d85f396..206f9e150d75be 100644
--- a/Lib/test/_code_definitions.py
+++ b/Lib/test/_code_definitions.py
@@ -1,4 +1,32 @@
 
+def simple_script():
+    assert True
+
+
+def complex_script():
+    obj = 'a string'
+    pickle = __import__('pickle')
+    def spam_minimal():
+        pass
+    spam_minimal()
+    data = pickle.dumps(obj)
+    res = pickle.loads(data)
+    assert res == obj, (res, obj)
+
+
+def script_with_globals():
+    obj1, obj2 = spam(42)
+    assert obj1 == 42
+    assert obj2 is None
+
+
+def script_with_explicit_empty_return():
+    return None
+
+
+def script_with_return():
+    return True
+
 
 def spam_minimal():
     # no arg defaults or kwarg defaults
@@ -141,6 +169,11 @@ def ham_C_closure(z):
 
 TOP_FUNCTIONS = [
     # shallow
+    simple_script,
+    complex_script,
+    script_with_globals,
+    script_with_explicit_empty_return,
+    script_with_return,
     spam_minimal,
     spam_with_builtins,
     spam_with_globals_and_builtins,
@@ -179,6 +212,10 @@ def ham_C_closure(z):
 ]
 
 STATELESS_FUNCTIONS = [
+    simple_script,
+    complex_script,
+    script_with_explicit_empty_return,
+    script_with_return,
     spam,
     spam_minimal,
     spam_with_builtins,
@@ -200,10 +237,21 @@ def ham_C_closure(z):
 ]
 STATELESS_CODE = [
     *STATELESS_FUNCTIONS,
+    script_with_globals,
     spam_with_globals_and_builtins,
     spam_full,
 ]
 
+SCRIPT_FUNCTIONS = [
+    simple_script,
+    complex_script,
+    script_with_explicit_empty_return,
+    spam_minimal,
+    spam_with_builtins,
+    spam_with_inner_not_closure,
+    spam_with_inner_closure,
+]
+
 
 # generators
 
diff --git a/Lib/test/test_code.py b/Lib/test/test_code.py
index 6715ee051336a1..32cf8aacaf6b72 100644
--- a/Lib/test/test_code.py
+++ b/Lib/test/test_code.py
@@ -673,6 +673,20 @@ def test_local_kinds(self):
         VARKWARGS = CO_FAST_LOCAL | CO_FAST_ARG_VAR | CO_FAST_ARG_KW
 
         funcs = {
+            defs.simple_script: {},
+            defs.complex_script: {
+                'obj': CO_FAST_LOCAL,
+                'pickle': CO_FAST_LOCAL,
+                'spam_minimal': CO_FAST_LOCAL,
+                'data': CO_FAST_LOCAL,
+                'res': CO_FAST_LOCAL,
+            },
+            defs.script_with_globals: {
+                'obj1': CO_FAST_LOCAL,
+                'obj2': CO_FAST_LOCAL,
+            },
+            defs.script_with_explicit_empty_return: {},
+            defs.script_with_return: {},
             defs.spam_minimal: {},
             defs.spam_with_builtins: {
                 'x': CO_FAST_LOCAL,
@@ -898,6 +912,19 @@ def new_var_counts(*,
             }
 
         funcs = {
+            defs.simple_script: new_var_counts(),
+            defs.complex_script: new_var_counts(
+                purelocals=5,
+                globalvars=1,
+                attrs=2,
+            ),
+            defs.script_with_globals: new_var_counts(
+                purelocals=2,
+                globalvars=1,
+            ),
+            defs.script_with_explicit_empty_return: new_var_counts(),
+            defs.script_with_return: new_var_counts(),
+            defs.spam_minimal: new_var_counts(),
             defs.spam_minimal: new_var_counts(),
             defs.spam_with_builtins: new_var_counts(
                 purelocals=4,
diff --git a/Lib/test/test_crossinterp.py b/Lib/test/test_crossinterp.py
index 5ac0080db435a8..79bd420b585f3b 100644
--- a/Lib/test/test_crossinterp.py
+++ b/Lib/test/test_crossinterp.py
@@ -758,6 +758,97 @@ def test_other_objects(self):
         ])
 
 
+class ShareableScriptTests(_GetXIDataTests):
+
+    MODE = 'script'
+
+    VALID_SCRIPTS = [
+        '',
+        'spam',
+        '# a comment',
+        'print("spam")',
+        'raise Exception("spam")',
+        """if True:
+            do_something()
+            """,
+        """if True:
+            def spam(x):
+                return x
+            class Spam:
+                def eggs(self):
+                    return 42
+            x = Spam().eggs()
+            raise ValueError(spam(x))
+            """,
+    ]
+    INVALID_SCRIPTS = [
+        '    pass',
+        '----',
+        """if True:
+            # do something
+            """,
+    ]
+
+    def test_valid_str(self):
+        self.assert_roundtrip_not_equal([
+            *self.VALID_SCRIPTS,
+        ], expecttype=types.CodeType)
+
+    def test_invalid_str(self):
+        self.assert_not_shareable([
+            *self.INVALID_SCRIPTS,
+        ])
+
+    def test_valid_bytes(self):
+        self.assert_roundtrip_not_equal([
+            *(s.encode('utf8') for s in self.VALID_SCRIPTS),
+        ], expecttype=types.CodeType)
+
+    def test_invalid_bytes(self):
+        self.assert_not_shareable([
+            *(s.encode('utf8') for s in self.INVALID_SCRIPTS),
+        ])
+
+    def test_script_code(self):
+        self.assert_roundtrip_equal_not_identical([
+            *(f.__code__ for f in defs.SCRIPT_FUNCTIONS),
+            defs.script_with_globals.__code__,
+        ])
+
+    def test_other_code(self):
+        self.assert_not_shareable([
+            *(f.__code__ for f in defs.FUNCTIONS
+              if f not in defs.SCRIPT_FUNCTIONS and
+                f is not defs.script_with_globals),
+            *(f.__code__ for f in defs.FUNCTION_LIKE),
+        ])
+
+    def test_script_function(self):
+        self.assert_roundtrip_not_equal([
+            *defs.SCRIPT_FUNCTIONS,
+        ], expecttype=types.CodeType)
+
+    def test_other_function(self):
+        self.assert_not_shareable([
+            *(f for f in defs.FUNCTIONS
+              if f not in defs.SCRIPT_FUNCTIONS),
+            *defs.FUNCTION_LIKE,
+        ])
+
+    def test_other_objects(self):
+        self.assert_not_shareable([
+            None,
+            True,
+            False,
+            Ellipsis,
+            NotImplemented,
+            (),
+            [],
+            {},
+            object(),
+        ])
+
+
 class ShareableTypeTests(_GetXIDataTests):
 
     MODE = 'xidata'
diff --git a/Modules/_testinternalcapi.c b/Modules/_testinternalcapi.c
index 63f1d079d8d312..836d739f8498c5 100644
--- a/Modules/_testinternalcapi.c
+++ b/Modules/_testinternalcapi.c
@@ -1989,6 +1989,11 @@ get_crossinterp_data(PyObject *self, PyObject *args, PyObject *kwargs)
             goto error;
         }
     }
+    else if (strcmp(mode, "script") == 0) {
+        if (_PyCode_GetScriptXIData(tstate, obj, xidata) != 0) {
+            goto error;
+        }
+    }
     else {
         PyErr_Format(PyExc_ValueError, "unsupported mode %R", modeobj);
         goto error;
diff --git a/Python/crossinterp.c b/Python/crossinterp.c
index 74ce02f1a26401..10bd3e9bef2343 100644
--- a/Python/crossinterp.c
+++ b/Python/crossinterp.c
@@ -6,8 +6,10 @@
 #include "osdefs.h"               // MAXPATHLEN
 #include "pycore_ceval.h"         // _Py_simple_func
 #include "pycore_crossinterp.h"   // _PyXIData_t
+#include "pycore_function.h"      // _PyFunction_VerifyStateless()
 #include "pycore_initconfig.h"    // _PyStatus_OK()
 #include "pycore_namespace.h"     // _PyNamespace_New()
+#include "pycore_pythonrun.h"     // _Py_SourceAsString()
 #include "pycore_typeobject.h"    // _PyStaticType_InitBuiltin()
 
 
@@ -784,6 +786,103 @@ _PyMarshal_GetXIData(PyThreadState *tstate, PyObject *obj, _PyXIData_t *xidata)
 }
 
 
+/* script wrapper */
+
+static int
+verify_script(PyThreadState *tstate, PyCodeObject *co)
+{
+    assert(_PyCode_VerifyStateless(
+                tstate, co, NULL, NULL, _PyEval_GetBuiltins(tstate)) == 0);
+    if (co->co_argcount > 0
+        || co->co_posonlyargcount > 0
+        || co->co_kwonlyargcount > 0
+        || co->co_flags & (CO_VARARGS | CO_VARKEYWORDS))
+    {
+        _PyErr_SetString(tstate, PyExc_ValueError,
+                         "code with args not supported");
+        return -1;
+    }
+    if (!_PyCode_ReturnsOnlyNone(co)) {
+        _PyErr_SetString(tstate, PyExc_ValueError,
+                         "code that returns a value is not a script");
+        return -1;
+    }
+    return 0;
+}
+
+int
+_PyCode_GetScriptXIData(PyThreadState *tstate,
+                        PyObject *obj, _PyXIData_t *xidata)
+{
+    // Get the corresponding code object.
+    PyObject *code = NULL;
+    if (PyCode_Check(obj)) {
+        code = obj;
+        Py_INCREF(code);
+        PyObject *builtins = _PyEval_GetBuiltins(tstate);
+        assert(builtins != NULL);
+        if (_PyCode_VerifyStateless(
+                    tstate, (PyCodeObject *)code, NULL, NULL, builtins) < 0)
+        {
+            goto error;
+        }
+        if (verify_script(tstate, (PyCodeObject *)code) < 0) {
+            goto error;
+        }
+    }
+    else if (PyFunction_Check(obj)) {
+        code = PyFunction_GET_CODE(obj);
+        assert(code != NULL);
+        Py_INCREF(code);
+        if (_PyFunction_VerifyStateless(tstate, obj) < 0) {
+            goto error;
+        }
+        if (verify_script(tstate, (PyCodeObject *)code) < 0) {
+            goto error;
+        }
+    }
+    else {
+        const char *filename = "<script>";
+        PyCompilerFlags cf = _PyCompilerFlags_INIT;
+        cf.cf_flags = PyCF_SOURCE_IS_UTF8;
+        PyObject *ref = NULL;
+        const char *script =
+                _Py_SourceAsString(obj, "???", "???", &cf, &ref);
+        if (script == NULL) {
+            if (!PyBytes_Check(obj) && !PyUnicode_Check(obj)
+                && !PyByteArray_Check(obj) && !PyObject_CheckBuffer(obj))
+            {
+                // We discard the raised exception.
+                _PyErr_Format(tstate, PyExc_TypeError, "unsupported script %R", obj);
+            }
+            goto error;
+        }
+        code = Py_CompileStringExFlags(script, filename, Py_file_input, &cf, 0);
+        Py_XDECREF(ref);
+        if (code == NULL) {
+            goto error;
+        }
+    }
+
+    // Convert the code object.
+    int res = _PyCode_GetXIData(tstate, code, xidata);
+    Py_DECREF(code);
+    if (res < 0) {
+        return -1;
+    }
+    return 0;
+
+error:
+    Py_XDECREF(code);
+    PyObject *cause = _PyErr_GetRaisedException(tstate);
+    assert(cause != NULL);
+    _set_xid_lookup_failure(
+                tstate, NULL, "object not a valid script", cause);
+    Py_DECREF(cause);
+    return -1;
+}
+
+
 /* using cross-interpreter data */
 
 PyObject *

From 6772ed91328bde58deff88320b17ebbc133db476 Mon Sep 17 00:00:00 2001
From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Thu, 1 May 2025 18:41:26 -0600
Subject: [PATCH 2/6] Add _PyCode_GetPureScriptXIData().

---
 Include/internal/pycore_crossinterp.h |  4 ++
 Lib/test/_code_definitions.py         |  7 ++-
 Lib/test/test_crossinterp.py          | 45 ++++++++++++----
 Modules/_testinternalcapi.c           |  5 ++
 Python/crossinterp.c                  | 74 ++++++++++++++++++---------
 5 files changed, 101 insertions(+), 34 deletions(-)

diff --git a/Include/internal/pycore_crossinterp.h b/Include/internal/pycore_crossinterp.h
index f6e30a9b19dcf6..9c9b2c2f9c599d 100644
--- a/Include/internal/pycore_crossinterp.h
+++ b/Include/internal/pycore_crossinterp.h
@@ -195,6 +195,10 @@ PyAPI_FUNC(int) _PyCode_GetScriptXIData(
         PyThreadState *,
         PyObject *,
         _PyXIData_t *);
+PyAPI_FUNC(int) _PyCode_GetPureScriptXIData(
+        PyThreadState *,
+        PyObject *,
+        _PyXIData_t *);
 
 
 /* using cross-interpreter data */
diff --git a/Lib/test/_code_definitions.py b/Lib/test/_code_definitions.py
index 206f9e150d75be..733a15b25f6894 100644
--- a/Lib/test/_code_definitions.py
+++ b/Lib/test/_code_definitions.py
@@ -242,7 +242,7 @@ def ham_C_closure(z):
     spam_full,
 ]
 
-SCRIPT_FUNCTIONS = [
+PURE_SCRIPT_FUNCTIONS = [
     simple_script,
     complex_script,
     script_with_explicit_empty_return,
@@ -251,6 +251,11 @@ def ham_C_closure(z):
     spam_with_inner_not_closure,
     spam_with_inner_closure,
 ]
+SCRIPT_FUNCTIONS = [
+    *PURE_SCRIPT_FUNCTIONS,
+    script_with_globals,
+    spam_with_globals_and_builtins,
+]
 
 
 # generators
diff --git a/Lib/test/test_crossinterp.py b/Lib/test/test_crossinterp.py
index 79bd420b585f3b..c2effb200081f9 100644
--- a/Lib/test/test_crossinterp.py
+++ b/Lib/test/test_crossinterp.py
@@ -758,9 +758,9 @@ def test_other_objects(self):
         ])
 
 
-class ShareableScriptTests(_GetXIDataTests):
+class PureShareableScriptTests(_GetXIDataTests):
 
-    MODE = 'script'
+    MODE = 'script-pure'
 
     VALID_SCRIPTS = [
         '',
@@ -809,25 +809,35 @@ def test_invalid_bytes(self):
             *(s.encode('utf8') for s in self.INVALID_SCRIPTS),
         ])
 
-    def test_script_code(self):
+    def test_pure_script_code(self):
         self.assert_roundtrip_equal_not_identical([
-            *(f.__code__ for f in defs.SCRIPT_FUNCTIONS),
-            defs.script_with_globals.__code__,
+            *(f.__code__ for f in defs.PURE_SCRIPT_FUNCTIONS),
+        ])
+
+    def test_impure_script_code(self):
+        self.assert_not_shareable([
+            *(f.__code__ for f in defs.SCRIPT_FUNCTIONS
+              if f not in defs.PURE_SCRIPT_FUNCTIONS),
         ])
 
     def test_other_code(self):
         self.assert_not_shareable([
             *(f.__code__ for f in defs.FUNCTIONS
-              if f not in defs.SCRIPT_FUNCTIONS and
-                f is not defs.script_with_globals),
+              if f not in defs.SCRIPT_FUNCTIONS),
             *(f.__code__ for f in defs.FUNCTION_LIKE),
         ])
 
-    def test_script_function(self):
+    def test_pure_script_function(self):
         self.assert_roundtrip_not_equal([
-            *defs.SCRIPT_FUNCTIONS,
+            *defs.PURE_SCRIPT_FUNCTIONS,
         ], expecttype=types.CodeType)
 
+    def test_impure_script_function(self):
+        self.assert_not_shareable([
+            *(f for f in defs.SCRIPT_FUNCTIONS
+              if f not in defs.PURE_SCRIPT_FUNCTIONS),
+        ])
+
     def test_other_function(self):
         self.assert_not_shareable([
             *(f for f in defs.FUNCTIONS
@@ -849,6 +859,23 @@ def test_other_objects(self):
         ])
 
 
+class ShareableScriptTests(PureShareableScriptTests):
+
+    MODE = 'script'
+
+    def test_impure_script_code(self):
+        self.assert_roundtrip_equal_not_identical([
+            *(f.__code__ for f in defs.SCRIPT_FUNCTIONS
+              if f not in defs.PURE_SCRIPT_FUNCTIONS),
+        ])
+
+    def test_impure_script_function(self):
+        self.assert_roundtrip_not_equal([
+            *(f for f in defs.SCRIPT_FUNCTIONS
+              if f not in defs.PURE_SCRIPT_FUNCTIONS),
+        ], expecttype=types.CodeType)
+
+
 class ShareableTypeTests(_GetXIDataTests):
 
     MODE = 'xidata'
diff --git a/Modules/_testinternalcapi.c b/Modules/_testinternalcapi.c
index 836d739f8498c5..3030f45d72cefa 100644
--- a/Modules/_testinternalcapi.c
+++ b/Modules/_testinternalcapi.c
@@ -1994,6 +1994,11 @@ get_crossinterp_data(PyObject *self, PyObject *args, PyObject *kwargs)
             goto error;
         }
     }
+    else if (strcmp(mode, "script-pure") == 0) {
+        if (_PyCode_GetPureScriptXIData(tstate, obj, xidata) != 0) {
+            goto error;
+        }
+    }
     else {
         PyErr_Format(PyExc_ValueError, "unsupported mode %R", modeobj);
         goto error;
diff --git a/Python/crossinterp.c b/Python/crossinterp.c
index 10bd3e9bef2343..adf347eff6bef9 100644
--- a/Python/crossinterp.c
+++ b/Python/crossinterp.c
@@ -789,10 +789,21 @@ _PyMarshal_GetXIData(PyThreadState *tstate, PyObject *obj, _PyXIData_t *xidata)
 /* script wrapper */
 
 static int
-verify_script(PyThreadState *tstate, PyCodeObject *co)
+verify_script(PyThreadState *tstate, PyCodeObject *co, int checked, int pure)
 {
-    assert(_PyCode_VerifyStateless(
-                tstate, co, NULL, NULL, _PyEval_GetBuiltins(tstate)) == 0);
+    // Make sure it isn't a closure and (optionally) doesn't use globals.
+    PyObject *builtins = NULL;
+    if (pure) {
+        builtins = _PyEval_GetBuiltins(tstate);
+        assert(builtins != NULL);
+    }
+    if (checked) {
+        assert(_PyCode_VerifyStateless(tstate, co, NULL, NULL, builtins) == 0);
+    }
+    else if (_PyCode_VerifyStateless(tstate, co, NULL, NULL, builtins) < 0) {
+        return -1;
+    }
+    // Make sure it doesn't have args.
     if (co->co_argcount > 0
         || co->co_posonlyargcount > 0
         || co->co_kwonlyargcount > 0
@@ -802,6 +813,7 @@ verify_script(PyThreadState *tstate, PyCodeObject *co)
                          "code with args not supported");
         return -1;
     }
+    // Make sure it doesn't return anything.
     if (!_PyCode_ReturnsOnlyNone(co)) {
         _PyErr_SetString(tstate, PyExc_ValueError,
                          "code that returns a value is not a script");
@@ -810,35 +822,26 @@ verify_script(PyThreadState *tstate, PyCodeObject *co)
     return 0;
 }
 
-int
-_PyCode_GetScriptXIData(PyThreadState *tstate,
-                        PyObject *obj, _PyXIData_t *xidata)
+static int
+get_script_xidata(PyThreadState *tstate, PyObject *obj, int pure,
+                  _PyXIData_t *xidata)
 {
     // Get the corresponding code object.
     PyObject *code = NULL;
+    int checked = 0;
     if (PyCode_Check(obj)) {
         code = obj;
         Py_INCREF(code);
-        PyObject *builtins = _PyEval_GetBuiltins(tstate);
-        assert(builtins != NULL);
-        if (_PyCode_VerifyStateless(
-                    tstate, (PyCodeObject *)code, NULL, NULL, builtins) < 0)
-        {
-            goto error;
-        }
-        if (verify_script(tstate, (PyCodeObject *)code) < 0) {
-            goto error;
-        }
     }
     else if (PyFunction_Check(obj)) {
         code = PyFunction_GET_CODE(obj);
         assert(code != NULL);
         Py_INCREF(code);
-        if (_PyFunction_VerifyStateless(tstate, obj) < 0) {
-            goto error;
-        }
-        if (verify_script(tstate, (PyCodeObject *)code) < 0) {
-            goto error;
+        if (pure) {
+            if (_PyFunction_VerifyStateless(tstate, obj) < 0) {
+                goto error;
+            }
+            checked = 1;
         }
     }
     else {
@@ -846,14 +849,14 @@ _PyCode_GetScriptXIData(PyThreadState *tstate,
         PyCompilerFlags cf = _PyCompilerFlags_INIT;
         cf.cf_flags = PyCF_SOURCE_IS_UTF8;
         PyObject *ref = NULL;
-        const char *script =
-                _Py_SourceAsString(obj, "???", "???", &cf, &ref);
+        const char *script = _Py_SourceAsString(obj, "???", "???", &cf, &ref);
         if (script == NULL) {
             if (!PyBytes_Check(obj) && !PyUnicode_Check(obj)
                 && !PyByteArray_Check(obj) && !PyObject_CheckBuffer(obj))
             {
                 // We discard the raised exception.
-                _PyErr_Format(tstate, PyExc_TypeError, "unsupported script %R", obj);
+                _PyErr_Format(tstate, PyExc_TypeError,
+                              "unsupported script %R", obj);
             }
             goto error;
         }
@@ -862,6 +865,15 @@ _PyCode_GetScriptXIData(PyThreadState *tstate,
         if (code == NULL) {
             goto error;
         }
+        if (!pure) {
+            // It can't be a closure.
+            checked = 1;
+        }
+    }
+
+    // Make sure it's actually a script.
+    if (verify_script(tstate, (PyCodeObject *)code, checked, pure) < 0) {
+        goto error;
     }
 
     // Convert the code object.
@@ -882,6 +894,20 @@ _PyCode_GetScriptXIData(PyThreadState *tstate,
     return -1;
 }
 
+int
+_PyCode_GetScriptXIData(PyThreadState *tstate,
+                        PyObject *obj, _PyXIData_t *xidata)
+{
+    return get_script_xidata(tstate, obj, 0, xidata);
+}
+
+int
+_PyCode_GetPureScriptXIData(PyThreadState *tstate,
+                            PyObject *obj, _PyXIData_t *xidata)
+{
+    return get_script_xidata(tstate, obj, 1, xidata);
+}
+
 
 /* using cross-interpreter data */
 

From 3823f5a82c5fa9092cf5f6ada5e27f08ae52073b Mon Sep 17 00:00:00 2001
From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Thu, 8 May 2025 08:19:13 -0600
Subject: [PATCH 3/6] Add _PyObject_SupportedAsScript().

---
 Include/internal/pycore_pythonrun.h |  1 +
 Python/crossinterp.c                |  4 +---
 Python/pythonrun.c                  | 20 ++++++++++++++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Include/internal/pycore_pythonrun.h b/Include/internal/pycore_pythonrun.h
index 0bfc5704dc4c59..7daed1326af8d5 100644
--- a/Include/internal/pycore_pythonrun.h
+++ b/Include/internal/pycore_pythonrun.h
@@ -25,6 +25,7 @@ extern int _PyRun_InteractiveLoopObject(
     PyObject *filename,
     PyCompilerFlags *flags);
 
+extern int _PyObject_SupportedAsScript(PyObject *);
 extern const char* _Py_SourceAsString(
     PyObject *cmd,
     const char *funcname,
diff --git a/Python/crossinterp.c b/Python/crossinterp.c
index adf347eff6bef9..d7d23e93257519 100644
--- a/Python/crossinterp.c
+++ b/Python/crossinterp.c
@@ -851,9 +851,7 @@ get_script_xidata(PyThreadState *tstate, PyObject *obj, int pure,
         PyObject *ref = NULL;
         const char *script = _Py_SourceAsString(obj, "???", "???", &cf, &ref);
         if (script == NULL) {
-            if (!PyBytes_Check(obj) && !PyUnicode_Check(obj)
-                && !PyByteArray_Check(obj) && !PyObject_CheckBuffer(obj))
-            {
+            if (!_PyObject_SupportedAsScript(obj)) {
                 // We discard the raised exception.
                 _PyErr_Format(tstate, PyExc_TypeError,
                               "unsupported script %R", obj);
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 4ee287af72fdb2..f67b72aa91f671 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1524,6 +1524,26 @@ Py_CompileStringExFlags(const char *str, const char *filename_str, int start,
     return co;
 }
 
+int
+_PyObject_SupportedAsScript(PyObject *cmd)
+{
+    if (PyUnicode_Check(cmd)) {
+        return 1;
+    }
+    else if (PyBytes_Check(cmd)) {
+        return 1;
+    }
+    else if (PyByteArray_Check(cmd)) {
+        return 1;
+    }
+    else if (PyObject_CheckBuffer(cmd)) {
+        return 1;
+    }
+    else {
+        return 0;
+    }
+}
+
 const char *
 _Py_SourceAsString(PyObject *cmd, const char *funcname, const char *what, PyCompilerFlags *cf, PyObject **cmd_copy)
 {

From 5a1271392d263152fb2dc7d642342791222cc8c3 Mon Sep 17 00:00:00 2001
From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Thu, 8 May 2025 08:22:50 -0600
Subject: [PATCH 4/6] Make the optimize arg explicit.

---
 Python/crossinterp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Python/crossinterp.c b/Python/crossinterp.c
index d7d23e93257519..78014d95a95730 100644
--- a/Python/crossinterp.c
+++ b/Python/crossinterp.c
@@ -846,6 +846,7 @@ get_script_xidata(PyThreadState *tstate, PyObject *obj, int pure,
     }
     else {
         const char *filename = "<script>";
+        int optimize = 0;
         PyCompilerFlags cf = _PyCompilerFlags_INIT;
         cf.cf_flags = PyCF_SOURCE_IS_UTF8;
         PyObject *ref = NULL;
@@ -858,7 +859,8 @@ get_script_xidata(PyThreadState *tstate, PyObject *obj, int pure,
             }
             goto error;
         }
-        code = Py_CompileStringExFlags(script, filename, Py_file_input, &cf, 0);
+        code = Py_CompileStringExFlags(
+                    script, filename, Py_file_input, &cf, optimize);
         Py_XDECREF(ref);
         if (code == NULL) {
             goto error;

From b3f80aaf7a0edb6d83b938a77c32f6e14862a798 Mon Sep 17 00:00:00 2001
From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Thu, 8 May 2025 08:34:07 -0600
Subject: [PATCH 5/6] Add a comment.

---
 Python/crossinterp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Python/crossinterp.c b/Python/crossinterp.c
index 78014d95a95730..7d7e6551c3f2d2 100644
--- a/Python/crossinterp.c
+++ b/Python/crossinterp.c
@@ -865,8 +865,10 @@ get_script_xidata(PyThreadState *tstate, PyObject *obj, int pure,
         if (code == NULL) {
             goto error;
         }
+        // Compiled text can't have args or any return statements,
+        // nor be a closure.  It can use globals though.
         if (!pure) {
-            // It can't be a closure.
+            // We don't need to check for globals either.
             checked = 1;
         }
     }

From ce5ae504db94c8edc06c4cf35729a56e72c8c1c5 Mon Sep 17 00:00:00 2001
From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Thu, 8 May 2025 08:39:30 -0600
Subject: [PATCH 6/6] Add some comments to the tested invalid scripts.

---
 Lib/test/test_crossinterp.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Lib/test/test_crossinterp.py b/Lib/test/test_crossinterp.py
index c2effb200081f9..b366a29645e9f2 100644
--- a/Lib/test/test_crossinterp.py
+++ b/Lib/test/test_crossinterp.py
@@ -782,11 +782,13 @@ def eggs(self):
             """,
     ]
     INVALID_SCRIPTS = [
-        '    pass',
-        '----',
+        '    pass',  # IndentationError
+        '----',  # SyntaxError
         """if True:
-            # do something
-            """,
+            def spam():
+                # no body
+            spam()
+            """,  # IndentationError
     ]
 
     def test_valid_str(self):