python · vstinner · Aug 31, 2023
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
@@ -408,7 +408,6 @@ struct _Py_global_strings {
        STRUCT_FOR_ID(extend)
        STRUCT_FOR_ID(extra_tokens)
        STRUCT_FOR_ID(f)
-        STRUCT_FOR_ID(facility)
        STRUCT_FOR_ID(factory)
        STRUCT_FOR_ID(false)
        STRUCT_FOR_ID(family)
@@ -460,8 +459,6 @@ struct _Py_global_strings {
        STRUCT_FOR_ID(headers)
        STRUCT_FOR_ID(hi)
        STRUCT_FOR_ID(hook)
-        STRUCT_FOR_ID(id)
-        STRUCT_FOR_ID(ident)
        STRUCT_FOR_ID(ignore)
        STRUCT_FOR_ID(imag)
        STRUCT_FOR_ID(importlib)
@@ -524,7 +521,6 @@ struct _Py_global_strings {
        STRUCT_FOR_ID(lo)
        STRUCT_FOR_ID(locale)
        STRUCT_FOR_ID(locals)
-        STRUCT_FOR_ID(logoption)
        STRUCT_FOR_ID(loop)
        STRUCT_FOR_ID(mapping)
        STRUCT_FOR_ID(match)
@@ -560,7 +556,6 @@ struct _Py_global_strings {
        STRUCT_FOR_ID(narg)
        STRUCT_FOR_ID(ndigits)
        STRUCT_FOR_ID(new_file_name)
-        STRUCT_FOR_ID(new_limit)
        STRUCT_FOR_ID(newline)
        STRUCT_FOR_ID(newlines)
        STRUCT_FOR_ID(next)

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
@@ -23,7 +23,10 @@

 def _make_clinic(*, filename='clinic_tests'):
    clang = clinic.CLanguage(None)
-    c = clinic.Clinic(clang, filename=filename, limited_capi=False)
+    c = clinic.Clinic(clang,
+                      filename=filename,
+                      limited_capi=False,
+                      internal_capi=True)
    c.block_parser = clinic.BlockParser('', clang)
    return c

@@ -125,7 +128,7 @@ def test_parse_with_body_prefix(self):
        clang.body_prefix = "//"
        clang.start_line = "//[{dsl_name} start]"
        clang.stop_line = "//[{dsl_name} stop]"
-        cl = clinic.Clinic(clang, filename="test.c", limited_capi=False)
+        cl = clinic.Clinic(clang, filename="test.c", limited_capi=False, internal_capi=True)
        raw = dedent("""
            //[clinic start]
            //module test
@@ -834,7 +837,7 @@ def _test(self, input, output):
        writer = clinic.BlockPrinter(language)
        c = _make_clinic()
        for block in blocks:
-            writer.print_block(block, limited_capi=c.limited_capi, header_includes=c.includes)
+            writer.print_block(block, header_includes=c.includes)
        output = writer.f.getvalue()
        assert output == input, "output != input!\n\noutput " + repr(output) + "\n\n input " + repr(input)

@@ -860,7 +863,10 @@ def test_round_trip_2(self):

    def _test_clinic(self, input, output):
        language = clinic.CLanguage(None)
-        c = clinic.Clinic(language, filename="file", limited_capi=False)
+        c = clinic.Clinic(language,
+                          filename="file",
+                          limited_capi=False,
+                          internal_capi=True)
        c.parsers['inert'] = InertParser(c)
        c.parsers['copy'] = CopyParser(c)
        computed = c.parse(input)
@@ -2673,12 +2679,6 @@ def test_file_dest(self):
            preserve
            [clinic start generated code]*/

-            #if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE)
-            #  include "pycore_gc.h"            // PyGC_Head
-            #  include "pycore_runtime.h"       // _Py_ID()
-            #endif
-
-
            PyDoc_VAR(func__doc__);

            PyDoc_STRVAR(func__doc__,
@@ -2691,7 +2691,7 @@ def test_file_dest(self):

            static PyObject *
            func(PyObject *module, PyObject *a)
-            /*[clinic end generated code: output=56c09670e89a0d9a input=a9049054013a1b77]*/
+            /*[clinic end generated code: output=3dde2d13002165b9 input=a9049054013a1b77]*/
        """)
        with os_helper.temp_dir() as tmp_dir:
            in_fn = os.path.join(tmp_dir, "test.c")

diff --git a/Modules/_blake2/clinic/blake2b_impl.c.h b/Modules/_blake2/clinic/blake2b_impl.c.h
diff --git a/Modules/_blake2/clinic/blake2s_impl.c.h b/Modules/_blake2/clinic/blake2s_impl.c.h
diff --git a/Modules/_csv.c b/Modules/_csv.c
@@ -10,6 +10,9 @@ module instead.

 #define MODULE_VERSION "1.0"

+// Argument Clinic avoids the internal C API
+#define Py_ARGUMENT_CLINIC_AVOID_INTERNAL_CAPI
+
 #include "Python.h"

 #include <stddef.h>               // offsetof()

diff --git a/Modules/_ctypes/clinic/callproc.c.h b/Modules/_ctypes/clinic/callproc.c.h
diff --git a/Modules/_io/clinic/_iomodule.c.h b/Modules/_io/clinic/_iomodule.c.h
diff --git a/Modules/_io/clinic/bufferedio.c.h b/Modules/_io/clinic/bufferedio.c.h
diff --git a/Modules/_io/clinic/bytesio.c.h b/Modules/_io/clinic/bytesio.c.h
diff --git a/Modules/_io/clinic/fileio.c.h b/Modules/_io/clinic/fileio.c.h
diff --git a/Modules/_io/clinic/iobase.c.h b/Modules/_io/clinic/iobase.c.h
diff --git a/Modules/_io/clinic/stringio.c.h b/Modules/_io/clinic/stringio.c.h