Visitar URL original
bpo-41842: Add a unregister function in _codecs module by shihai1991 · Pull Request #22360 · python/cpython · GitHub
Skip to content

bpo-41842: Add a unregister function in _codecs module #22360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 15 commits into from
Sep 28, 2020
Merged

bpo-41842: Add a unregister function in _codecs module #22360

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fefda70
add a _codecs.unregister in _codecs module
shihai1991 Sep 22, 2020
f7775c0
apply victor's comment
shihai1991 Sep 23, 2020
71b624e
apply victor's comment
shihai1991 Sep 23, 2020
d186726
apply victor's comment
shihai1991 Sep 24, 2020
f8e912b
retrigger checks
shihai1991 Sep 24, 2020
40666fc
apply victor's comment
shihai1991 Sep 24, 2020
3257b6c
update doc
shihai1991 Sep 24, 2020
a493a35
update doc
shihai1991 Sep 24, 2020
e29ec44
Merge remote-tracking branch 'origin/master' into bpo_39337_new_3
shihai1991 Sep 24, 2020
db4631e
update doc
shihai1991 Sep 24, 2020
5efff22
apply victor's comment
shihai1991 Sep 24, 2020
f18cd4f
apply Dong-hee Na's comment
shihai1991 Sep 26, 2020
8f6dc4d
apply victor and Zackery's comment
shihai1991 Sep 26, 2020
4308ea8
apply victor's comment
shihai1991 Sep 26, 2020
c9a0c99
apply victor's comment
shihai1991 Sep 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
apply Dong-hee Na's comment
  • Loading branch information
@shihai1991
shihai1991 committed Sep 26, 2020
commit f18cd4f9f2dc12476069975c4b9ab955cd5c13f9
9 changes: 5 additions & 4 deletions Python/codecs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,18 @@ int
PyCodec_Unregister(PyObject *search_function)
{
PyInterpreterState *interp = PyInterpreterState_Get();
PyObject *codec_search_path = interp->codec_search_path;
/* Do nothing if codec_search_path is not created yet or was cleared. */
Comment thread
shihai1991 marked this conversation as resolved.
if (interp->codec_search_path == NULL) {
if (codec_search_path == NULL) {
return 0;
}

Py_ssize_t n = PyList_Size(interp->codec_search_path);
Py_ssize_t n = PyList_Size(codec_search_path);

@ZackerySpytz ZackerySpytz Sep 26, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use the macro PyList_GET_SIZE() instead of PyList_Size(), as codec_search_path is guaranteed to be a list.

@vstinner vstinner Sep 26, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While it's a list right now, its type can change tomorrow.

@shihai1991: If you modify the code to use fast macros, please add the following assertion before using it:

assert(PyList_CheckExact(interp->codec_search_path));

@shihai1991 shihai1991 Sep 26, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vstinner Copy that, I have already updated it.
But I have a question. assert(PyList_Check(op) in _PyList_CAST() is not good enough?

for (Py_ssize_t i = 0; i < n; i++) {
PyObject *item = PyList_GetItem(interp->codec_search_path, i);
PyObject *item = PyList_GetItem(codec_search_path, i);
Comment thread
shihai1991 marked this conversation as resolved.
Outdated
if (item == search_function) {
Comment thread
shihai1991 marked this conversation as resolved.
PyDict_Clear(interp->codec_search_cache);
Comment thread
shihai1991 marked this conversation as resolved.
Outdated
return PyList_SetSlice(interp->codec_search_path, i, i+1, NULL);
return PyList_SetSlice(codec_search_path, i, i+1, NULL);
}
}
Comment thread
shihai1991 marked this conversation as resolved.
return 0;
Expand Down