apply victor's comment

python · vstinner · Sep 28, 2020 · Sep 22, 2020 · Sep 23, 2020 · Sep 23, 2020
commit d186726753b556ccb75646b7d6ee7235e29bc489
diff --git a/Doc/c-api/codec.rst b/Doc/c-api/codec.rst
@@ -10,6 +10,16 @@ Codec registry and support functions
    As side effect, this tries to load the :mod:`encodings` package, if not yet
    done, to make sure that it is always first in the list of search functions.
 
+.. c:function:: int PyCodec_Unregister(PyObject *search_function)
+
+   Unregister a codec search function.
+
+   Unregister a codec search function and clear the registry's cache.
+   If the search function is not registered, do nothing.
+   Return 0 on success. Raise an exception and return -1 on success.
+
+   .. versionadded:: 3.10
+
 .. c:function:: int PyCodec_KnownEncoding(const char *encoding)
 
    Return ``1`` or ``0`` depending on whether there is a registered codec for

diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
@@ -112,7 +112,8 @@ Base32 Encoding with Extended Hex Alphabet.
 codecs
 ------
 
-Add :func:`codecs.unregister` to unregister a codec search function.
+Add :func:`codecs.unregister` and :c:func:`PyCodec_Unregister` to unregister
+a codec search function.
 
 curses
 ------

diff --git a/Include/codecs.h b/Include/codecs.h
@@ -31,7 +31,7 @@ PyAPI_FUNC(int) PyCodec_Register(
 
    Unregister a codec search function and clear the registry's cache.
    If the search function is not registered, do nothing.
-   */
+   Return 0 on success. Raise an exception and return -1 on success. */
 
 PyAPI_FUNC(int) PyCodec_Unregister(
        PyObject *search_function

diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
@@ -1645,7 +1645,7 @@ def test_unregister(self):
         search_function = mock.Mock(return_value=(1, 2, 3, 4))
         codecs.register(search_function)
         codecs.unregister(search_function)
-        self.assertRaises(LookupError, codecs.lookup, "test")
+        self.assertRaises(LookupError, codecs.lookup, "nonexistent_codec_name")
         search_function.assert_not_called()
 
     def test_lookup(self):

diff --git a/Misc/NEWS.d/next/Library/2020-09-23-22-52-24.bpo-41842.lIuhC9.rst b/Misc/NEWS.d/next/Library/2020-09-23-22-52-24.bpo-41842.lIuhC9.rst
@@ -1 +1,2 @@
-Add a :func:`codecs.unregister` to unregister a codec search function.
+Add :func:`codecs.unregister` and :c:func:`PyCodec_Unregister` to unregister
+a codec search function.
diff --git a/Python/codecs.c b/Python/codecs.c
@@ -54,7 +54,7 @@ int
 PyCodec_Unregister(PyObject *search_function)
 {
     PyInterpreterState *interp = PyInterpreterState_Get();
-    /* Do nothing if codec_search_path is not created yet or was created. */
+    /* Do nothing if codec_search_path is not created yet or was cleared. */
     if (interp->codec_search_path == NULL) {
         return 0;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -112,7 +112,8 @@ Base32 Encoding with Extended Hex Alphabet. @@
     codecs
     ------
-    Add :func:`codecs.unregister` to unregister a codec search function.
+    Add :func:`codecs.unregister` and :c:func:`PyCodec_Unregister` to unregister
+    a codec search function.
     curses
     ------
@@ Expand Down @@