Rename to PyUnicode_AsUTF8NoNUL()

Author: vstinner

Doc/c-api/unicode.rst

@@ -1015,7 +1015,7 @@ These are the UTF-8 codec APIs:
    .. versionchanged:: 3.13
       Raise an exception if the string contains embedded null characters.
 
-.. c:function:: const char* PyUnicode_AsUTF8Safe(PyObject *unicode)
+.. c:function:: const char* PyUnicode_AsUTF8NoNUL(PyObject *unicode)
 
    Similar to :c:func:`PyUnicode_AsUTF8`, but raise :exc:`ValueError` if the
    string contains embedded null characters.

Doc/data/stable_abi.dat

@@ -1137,7 +1137,7 @@ New Features
 * Add :c:func:`PyUnicode_AsUTF8` function to the limited C API.
   (Contributed by Victor Stinner in :gh:`111089`.)
 
-* Add :c:func:`PyUnicode_AsUTF8Safe` function: similar to
+* Add :c:func:`PyUnicode_AsUTF8NoNUL` function: similar to
   :c:func:`PyUnicode_AsUTF8`, but raise :exc:`ValueError` if the string
   contains embedded null characters.
   (Contributed by Victor Stinner in :gh:`111089`.)

Doc/whatsnew/3.13.rst

@@ -455,7 +455,7 @@ PyAPI_FUNC(const char *) PyUnicode_AsUTF8(PyObject *unicode);
 
 // Similar to PyUnicode_AsUTF8(), but raise ValueError if the string contains
 // embedded null characters.
-PyAPI_FUNC(const char *) PyUnicode_AsUTF8Safe(PyObject *unicode);
+PyAPI_FUNC(const char *) PyUnicode_AsUTF8NoNUL(PyObject *unicode);
 
 // Returns a pointer to the UTF-8 encoding of the
 // Unicode object unicode and the size of the encoded representation

Include/unicodeobject.h

@@ -928,14 +928,14 @@ def test_asutf8(self):
 
     @support.cpython_only
     @unittest.skipIf(_testcapi is None, 'need _testcapi module')
-    def test_asutf8safe(self):
-        """Test PyUnicode_AsUTF8Safe()"""
-        from _testcapi import unicode_asutf8safe
-        self.check_asutf8(unicode_asutf8safe)
+    def test_asutf8nonul(self):
+        """Test PyUnicode_AsUTF8NoNUL()"""
+        from _testcapi import unicode_asutf8nonul
+        self.check_asutf8(unicode_asutf8nonul)
 
         # disallow embedded null characters
-        self.assertRaises(ValueError, unicode_asutf8safe, 'abc\0', 0)
-        self.assertRaises(ValueError, unicode_asutf8safe, 'abc\0def', 0)
+        self.assertRaises(ValueError, unicode_asutf8nonul, 'abc\0', 0)
+        self.assertRaises(ValueError, unicode_asutf8nonul, 'abc\0def', 0)
 
     @support.cpython_only
     @unittest.skipIf(_testcapi is None, 'need _testcapi module')

Lib/test/test_capi/test_unicode.py

@@ -1,3 +1,3 @@
-Add :c:func:`PyUnicode_AsUTF8Safe` function: similar to
+Add :c:func:`PyUnicode_AsUTF8NoNUL` function: similar to
 :c:func:`PyUnicode_AsUTF8`, but raise :exc:`ValueError` if the string
 contains embedded null characters. Patch by Victor Stinner.

Lib/test/test_stable_abi_ctypes.py

@@ -2480,7 +2480,7 @@
     added = '3.13'
 [function.PyUnicode_AsUTF8]
     added = '3.13'
-[function.PyUnicode_AsUTF8Safe]
+[function.PyUnicode_AsUTF8NoNUL]
     added = '3.13'
 [function._Py_SetRefcnt]
     added = '3.13'

Misc/NEWS.d/next/C API/2023-11-03-12-43-35.gh-issue-111089.LWRfqR.rst

@@ -76,7 +76,7 @@ isolation_level_converter(PyObject *str_or_none, const char **result)
         *result = NULL;
     }
     else if (PyUnicode_Check(str_or_none)) {
-        const char *str = PyUnicode_AsUTF8Safe(str_or_none);
+        const char *str = PyUnicode_AsUTF8NoNUL(str_or_none);
         if (str == NULL) {
             return 0;
         }