Skip to content

bpo-39337: Add a test case for normalizing of codec names #19069

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 17 commits into from
Oct 8, 2020
+25 −0
Merged

bpo-39337: Add a test case for normalizing of codec names #19069

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e9ecac0
add a test case to against nomralizeing() of codecs
shihai1991 Mar 19, 2020
cf46290
remove redundant operation
shihai1991 Mar 19, 2020
59911e1
not clear all codec_search_paths
shihai1991 Mar 20, 2020
aa3c4d0
remove codecs_unregister()
shihai1991 Mar 21, 2020
aa4bf51
remove useless head file
shihai1991 Mar 21, 2020
8ce5956
remove useless import
shihai1991 Mar 21, 2020
41a1672
retrigger checks
shihai1991 Apr 2, 2020
00b300c
Merge remote-tracking branch 'origin/master' into bpo_1635741_1
shihai1991 Sep 8, 2020
f48e5d9
add codecs_unregister() in testinternalcapi
shihai1991 Sep 10, 2020
3795420
update code
shihai1991 Sep 10, 2020
e3b9365
Merge remote-tracking branch 'origin/master' into bpo_1635741_1
shihai1991 Sep 29, 2020
a2887f3
Using codecs.unregister() in test case
shihai1991 Sep 29, 2020
632a448
apply Tal's comment
shihai1991 Sep 29, 2020
bb6e78c
apply victor's comment
shihai1991 Oct 3, 2020
72e2435
apply tal's comment
shihai1991 Oct 3, 2020
26fcbe4
apply victor's comment
shihai1991 Oct 5, 2020
37b80e0
apply victor's comment
shihai1991 Oct 8, 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
add codecs_unregister() in testinternalcapi
  • Loading branch information
@shihai1991
shihai1991 committed Sep 10, 2020
commit f48e5d9465da9139ae20970b8ded795f4a61ecc3
2 changes: 2 additions & 0 deletions Lib/test/test_codecs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from test import support
from test.support import os_helper
from test.support import warnings_helper
import _testinternalcapi

try:
import _testcapi
Expand Down Expand Up @@ -3414,6 +3415,7 @@ def search_function(encoding):
codecs.register(search_function)
self.assertEqual((1, 2, 3, 4), codecs.lookup('AAA-8'))
Comment thread
shihai1991 marked this conversation as resolved.
Outdated
self.assertEqual((None, None, None, None), codecs.lookup('BBB-8'))
_testinternalcapi.codecs_unregister(search_function)


if __name__ == "__main__":
Expand Down
41 changes: 37 additions & 4 deletions Modules/_testinternalcapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
#define PY_SSIZE_T_CLEAN

#include "Python.h"
#include "pycore_bitutils.h" // _Py_bswap32()
#include "pycore_initconfig.h" // _Py_GetConfigsAsDict()
#include "pycore_hashtable.h" // _Py_hashtable_new()
#include "pycore_gc.h" // PyGC_Head
#include "pycore_bitutils.h" // _Py_bswap32()
#include "pycore_initconfig.h" // _Py_GetConfigsAsDict()
#include "pycore_hashtable.h" // _Py_hashtable_new()
#include "pycore_gc.h" // PyGC_Head
#include "internal/pycore_interp.h" // PyInterpreterState_Get()


static PyObject *
Expand All @@ -35,6 +36,37 @@ get_recursion_depth(PyObject *self, PyObject *Py_UNUSED(args))
}


static PyObject*
codecs_unregister(PyObject *self, PyObject *args)
Comment thread
shihai1991 marked this conversation as resolved.
Outdated
{
PyObject *search_function;

if (!PyArg_ParseTuple(args, "O:codecs_unregister",
&search_function)) {
}
if (search_function == NULL) {
return NULL;
Comment thread
shihai1991 marked this conversation as resolved.
Outdated
}

PyInterpreterState *interp = PyInterpreterState_Get();
if (interp->codec_search_path == NULL) {
return NULL;
Comment thread
shihai1991 marked this conversation as resolved.
Outdated
}

Py_ssize_t n = PyList_Size(interp->codec_search_path);
PyObject *list = PyList_New(0);
for (Py_ssize_t i = 0; i < n; i++) {
PyObject *item = PyList_GetItem(interp->codec_search_path, i);
Comment thread
shihai1991 marked this conversation as resolved.
Outdated
if (item != search_function) {
PyList_Append(list, item);
}
}
Py_SETREF(interp->codec_search_path, list);

Py_RETURN_NONE;
Comment thread
taleinat marked this conversation as resolved.
Outdated
}


static PyObject*
test_bswap(PyObject *self, PyObject *Py_UNUSED(args))
{
Expand Down Expand Up @@ -234,6 +266,7 @@ test_hashtable(PyObject *self, PyObject *Py_UNUSED(args))
static PyMethodDef TestMethods[] = {
{"get_configs", get_configs, METH_NOARGS},
{"get_recursion_depth", get_recursion_depth, METH_NOARGS},
{"codecs_unregister", codecs_unregister, METH_VARARGS},
{"test_bswap", test_bswap, METH_NOARGS},
{"test_popcount", test_popcount, METH_NOARGS},
{"test_bit_length", test_bit_length, METH_NOARGS},
Expand Down