apply victor's comment

python · vstinner · Sep 28, 2020 · Sep 22, 2020 · Sep 23, 2020 · Sep 23, 2020
commit 71b624e3b6d09884b80670b98896d6638826db42
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
@@ -166,9 +166,8 @@ function:
 
 .. function:: unregister(search_function)
 
-   Unregister a codec search function from the codecs registry.
+   Unregister a codec search function and clear the registry's cache.
    If the search function is not registered, do nothing.
-   Clear the registry's cache if the codec search function is removed.
 
    .. versionadded:: 3.10
 

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

diff --git a/I 10000 nclude/codecs.h b/I 10000 nclude/codecs.h
@@ -27,6 +27,16 @@ PyAPI_FUNC(int) PyCodec_Register(
        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.
+   */
+
+PyAPI_FUNC(int) PyCodec_Unregister(
+       PyObject *search_function
+       );
+
 /* Codec registry lookup API.
 
    Looks up the given encoding and returns a CodecInfo object with
@@ -53,10 +63,6 @@ PyAPI_FUNC(PyObject *) _PyCodec_Lookup(
 PyAPI_FUNC(int) _PyCodec_Forget(
        const char *encoding
        );
-
-PyAPI_FUNC(int) _PyCodec_Unregister(
-       PyObject *search_function
-       );
 #endif
 
 /* Codec registry encoding check API.

diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
@@ -1642,10 +1642,11 @@ def test_register(self):
         self.assertRaises(TypeError, codecs.register, 42)
 
     def test_unregister(self):
-        def test_encoding(encoding):
-            return None
-        codecs.register(test_encoding)
-        self.assertEqual(codecs.unregister(test_encoding), None)
+        search_function = mock.Mock(return_value=(1, 2, 3, 4))
+        codecs.register(search_function)
+        codecs.unregister(search_function)
+        self.assertRaises(LookupError, codecs.lookup, "test")
+        search_function.assert_not_called()
 
     def test_lookup(self):
         self.assertRaises(TypeError, codecs.lookup)

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 @@
-Add a :func:`_codecs.unregister` to unregister a codec search function.
+Add a :func:`codecs.unregister` to unregister a codec search function.
diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c
@@ -73,16 +73,16 @@ _codecs.unregister
     search_function: object
     /
 
-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.
 [clinic start generated code]*/
 
 static PyObject *
 _codecs_unregister(PyObject *module, PyObject *search_function)
-/*[clinic end generated code: output=1f0edee9cf246399 input=8bfb99685e00d653]*/
+/*[clinic end generated code: output=1f0edee9cf246399 input=dd7c004c652d345e]*/
 {
-    if (_PyCodec_Unregister(search_function)) {
+    if (PyCodec_Unregister(search_function) < 0) {
         return NULL;
     }
 

diff --git a/Modules/clinic/_codecsmodule.c.h b/Modules/clinic/_codecsmodule.c.h
diff --git a/Python/codecs.c b/Python/codecs.c
@@ -51,7 +51,7 @@ int PyCodec_Register(PyObject *search_function)
 }
 
 int
-_PyCodec_Unregister(PyObject *search_function)
+PyCodec_Unregister(PyObject *search_function)
 {
     PyInterpreterState *interp = PyInterpreterState_Get();
     /* Do nothing if codec_search_path is not created yet or was created. */
@@ -63,10 +63,10 @@ _PyCodec_Unregister(PyObject *search_function)
     for (Py_ssize_t i = 0; i < n; i++) {
         PyObject *item = PyList_GetItem(interp->codec_search_path, i);
         if (item == search_function) {
+            PyDict_Clear(interp->codec_search_cache);
             return PyList_SetSlice(interp->codec_search_path, i, i+1, NULL);
         }
     }
-    PyDict_Clear(interp->codec_search_cache);
     return 0;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -112,7 +112,7 @@ Base32 Encoding with Extended Hex Alphabet. @@
     codecs
     ------
-    Add :func:`_codecs.unregister` to unregister a codec search function.
+    Add :func:`codecs.unregister` to unregister a codec search function.
     curses
     ------
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Add a :func:`_codecs.unregister` to unregister a codec search function.
		Add a :func:`codecs.unregister` to unregister a codec search function.