10000 gh-111495: Add tests for `PyCodec_*` C API by picnixz · Pull Request #123343 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-111495: Add tests for PyCodec_* C API #123343

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
merged 23 commits into from
Sep 29, 2024
Merged

gh-111495: Add tests for PyCodec_* C API #123343

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
ce7c135
add tests for C API `codecs`
picnixz Aug 26, 2024
f9e350a
add Python tests for `_codecs`
picnixz Aug 26, 2024
15b6811
fix size bug
picnixz Aug 26, 2024
8048ae1
rename test class
picnixz Aug 26, 2024
8487b46
Revert "fix size bug"
picnixz Sep 25, 2024
2dbe09a
Merge branch 'main' into test/c-api-codec-111495
picnixz Sep 25, 2024
0097f2a
Disable tests that are known to crash.
picnixz Sep 25, 2024
303b13c
address Victor's review
picnixz Sep 25, 2024
4f474dd
update tests to reflect user errors
picnixz Sep 25, 2024
d49743c
Merge remote-tracking branch 'upstream/main' into test/c-api-codec-11…
picnixz Sep 27, 2024
87ee0d2
fix C API codec tests
picnixz Sep 27, 2024
6a36eb0
small hack to make the test suite correct
picnixz Sep 27, 2024
145b285
remove un-necessary imports
picnixz Sep 28, 2024
dc9af16
Merge remote-tracking branch 'upstream/main' into test/c-api-codec-11…
picnixz Sep 29, 2024
7be1f55
use `_codecs._unregister_error` to cleanup test state
picnixz Sep 29, 2024
f72be5c
indicate some semantics for NULL case being tested
picnixz Sep 29, 2024
4d02c6c
revert a cosmetic change
picnixz Sep 29, 2024
0f26ca7
Move `PyCodec_NameReplaceErrors` test to the `_testlimitedcapi` module
picnixz Sep 29, 2024
1399779
add comment for why we do not test `_PyCodec_UnregisterError`
picnixz Sep 29, 2024
914151e
update a comment
picnixz Sep 29, 2024
8dd7e8d
revert one cosmetic change
picnixz Sep 29, 2024
1e6a5ce
Fix Windows compilation
picnixz Sep 29, 2024
2ba5f03
address Victor's review
picnixz Sep 29, 2024
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
10000
Prev Previous commit
Next Next commit
indicate some semantics for NULL case being tested
  • Loading branch information
@picnixz
picnixz committed Sep 29, 2024
commit f72be5c600824765297441319b8faa523036143a
39 changes: 16 additions & 23 deletions Modules/_testcapi/codec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
#include "parts.h"

/*
* The Codecs C API assume that 'encoding' is not NULL, lest
* it uses PyErr_BadArgument() to set a TypeError exception.
*
* In this file, we allow to call the functions using None
* as NULL to explicitly check this behaviour.
*/
#include "util.h"

// === Codecs registration and un-registration ================================

Expand Down Expand Up @@ -44,8 +37,8 @@ static PyObject *
codec_encode(PyObject *Py_UNUSED(module), PyObject *args)
{
PyObject *input;
const char *encoding; // should not be NULL (see top-file comment)
const char *errors; // can be NULL
const char *NULL_WOULD_RAISE(encoding); // NULL case will be tested
const char *errors; // can be NULL
if (!PyArg_ParseTuple(args, "O|zz", &input, &encoding, &errors)) {
return NULL;
}
Expand All @@ -56,8 +49,8 @@ static PyObject *
codec_decode(PyObject *Py_UNUSED(module), PyObject *args)
{
PyObject *input;
const char *encoding; // should not be NULL (see top-file comment)
const char *errors; // can be NULL
const char *NULL_WOULD_RAISE(encoding); // NULL case will be tested
const char *errors; // can be NULL
if (!PyArg_ParseTuple(args, "O|zz", &input, &encoding, &errors)) {
return NULL;
}
Expand All @@ -67,7 +60,7 @@ codec_decode(PyObject *Py_UNUSED(module), PyObject *args)
static PyObject *
codec_encoder(PyObject *Py_UNUSED(module), PyObject *args)
{
const char *encoding; // should not be NULL (see top-file comment)
const char *NULL_WOULD_RAISE(encoding); // NULL case will be tested
if (!PyArg_ParseTuple(args, "z", &encoding)) {
return NULL;
}
Expand All @@ -77,7 +70,7 @@ codec_encoder(PyObject *Py_UNUSED(module), PyObject *args)
static PyObject *
codec_decoder(PyObject *Py_UNUSED(module), PyObject *args)
{
const char *encoding; // should not be NULL (see top-file comment)
const char *NULL_WOULD_RAISE(encoding); // NULL case will be tested
if (!PyArg_ParseTuple(args, "z", &encoding)) {
return NULL;
}
Expand All @@ -87,8 +80,8 @@ codec_decoder(PyObject *Py_UNUSED(module), PyObject *args)
static PyObject *
codec_incremental_encoder(PyObject *Py_UNUSED(module), PyObject *args)
{
const char *encoding; // should not be NULL (see top-file comment)
const char *errors; // can be NULL
const char *NULL_WOULD_RAISE(encoding); // NULL case will be tested
const char *errors; // can be NULL
if (!PyArg_ParseTuple(args, "zz", &encoding, &errors)) {
return NULL;
}
Expand All @@ -98,8 +91,8 @@ codec_incremental_encoder(PyObject *Py_UNUSED(module), PyObject *args)
static PyObject *
codec_incremental_decoder(PyObject *Py_UNUSED(module), PyObject *args)
{
const char *encoding; // should not be NULL (see top-file comment)
const char *errors; // can be NULL
const char *NULL_WOULD_RAISE(encoding); // NULL case will be tested
const char *errors; // can be NULL
if (!PyArg_ParseTuple(args, "zz", &encoding, &errors)) {
return NULL;
}
Expand All @@ -109,9 +102,9 @@ codec_incremental_decoder(PyObject *Py_UNUSED(module), PyObject *args)
static PyObject *
codec_stream_reader(PyObject *Py_UNUSED(module), PyObject *args)
{
const char *encoding; // should not be NULL (see top-file comment)
const char *NULL_WOULD_RAISE(encoding); // NULL case will be tested
PyObject *stream;
const char *errors; // can be NULL
const char *errors; // can be NULL
if (!PyArg_ParseTuple(args, "zOz", &encoding, &stream, &errors)) {
return NULL;
}
Expand All @@ -121,9 +114,9 @@ codec_stream_reader(PyObject *Py_UNUSED(module), PyObject *args)
static PyObject *
codec_stream_writer(PyObject *Py_UNUSED(module), PyObject *args)
{
const char *encoding; // should not be NULL (see top-file comment)
const char *NULL_WOULD_RAISE(encoding); // NULL case will be tested
PyObject *stream;
const char *errors; // can be NULL
const char *errors; // can be NULL
if (!PyArg_ParseTuple(args, "zOz", &encoding, &stream, &errors)) {
return NULL;
}
Expand All @@ -149,7 +142,7 @@ codec_register_error(PyObject *Py_UNUSED(module), PyObject *args)
static PyObject *
codec_lookup_error(PyObject *Py_UNUSED(module), PyObject *args)
{
const char *encoding; // can be NULL
const char *NULL_WOULD_RAISE(encoding); // NULL case will be tested
if (!PyArg_ParseTuple(args, "z", &encoding)) {
return NULL;
}
Expand Down
10 changes: 10 additions & 0 deletions Modules/_testcapi/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,13 @@ static const char uninitialized[] = "uninitialized";
#define UNINITIALIZED_SIZE ((Py_ssize_t)236892191)
/* Marker to check that integer value was set. */
#define UNINITIALIZED_INT (63256717)
/*
* Marker to indicate that a NULL parameter would not be allowed
* at runtime but that the test interface will check that it is
* indeed the case.
*
* Use this macro only if passing NULL to the C API would raise
* a catchable exception (and not a fatal exception that would
* crash the interpreter).
*/
#define NULL_WOULD_RAISE(NAME) NAME
0