FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-142217: Add tests on the deprecated _Py_Identifier C API by vstinner · Pull Request #157638 · python/cpython · GitHub

Repository navigation

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .c  (2) .rst  (1) .tsv  (1) All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Add tests on the undocumented and deprecated ``_Py_Identifier`` C API. Patch
by Victor Stinner.
14 changes: 3 additions & 11 deletions Modules/_pickle.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -4745,17 +4745,9 @@ save(PickleState *st, PicklerObject *self, PyObject *obj, int pers_save)
* __reduce_ex__ method, or the object's __reduce__ method.
*/
if (self->dispatch_table == NULL) {
reduce_func = PyDict_GetItemWithError(st->dispatch_table,
(PyObject *)type);
if (reduce_func == NULL) {
if (PyErr_Occurred()) {
goto error;
}
} else {
/* PyDict_GetItemWithError() returns a borrowed reference.
Increase the reference count to be consistent with
PyObject_GetItem and _PyObject_GetAttrId used below. */
Py_INCREF(reduce_func);
if (PyDict_GetItemRef(st->dispatch_table, (PyObject *)type,
&reduce_func) < 0) {
goto error;
}
}
else if (PyMapping_GetOptionalItem(self->dispatch_table, (PyObject *)type,
Expand Down
50 changes: 50 additions & 0 deletions Modules/_testcapi/unicode.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,55 @@ unicode_GET_CACHED_HASH(PyObject *self, PyObject *arg)
}


// Test the deprecated _Py_Identifier C API:
// - _Py_IDENTIFIER()
// - _Py_static_string()
// - _Py_static_string_init()
// - _PyObject_CallMethodId()
// - _PyObject_GetAttrId()
// - _PyUnicode_FromId()
//
// _testembed also has tests on _PyUnicode_FromId().
static PyObject*
test_py_identifier(PyObject *self, PyObject *Py_UNUSED(args))
{
// Ignore deprecation warnings
_Py_COMP_DIAG_PUSH
_Py_COMP_DIAG_IGNORE_DEPR_DECLS

_Py_IDENTIFIER(hello);
PyObject *str = _PyUnicode_FromId(&PyId_hello); // borrowed ref
if (str == NULL) {
return NULL;
}
assert(PyUnicode_EqualToUTF8(str, "hello") == 1);

// Calling twice return the same object
PyObject *str2 = _PyUnicode_FromId(&PyId_hello); // borrowed ref
assert(str2 == str);

PyObject *number = Py_GetConstant(Py_CONSTANT_ONE); // immortal
_Py_static_string(to_bytes_id, "to_bytes");
PyObject *res = _PyObject_CallMethodId(number, &to_bytes_id, NULL);
if (res == NULL) {
return NULL;
}
Py_DECREF(res);

static _Py_Identifier real_id = _Py_static_string_init("real");
res = _PyObject_GetAttrId(number, &real_id);
if (res == NULL) {
return NULL;
}
assert(res == number);
Py_DECREF(res);

Py_RETURN_NONE;

_Py_COMP_DIAG_POP
}


// --- PyUnicodeWriter type -------------------------------------------------

typedef struct {
Expand Down Expand Up @@ -572,6 +621,7 @@ static PyMethodDef TestMethods[] = {
{"unicode_asutf8", unicode_asutf8, METH_VARARGS},
{"unicode_copycharacters", unicode_copycharacters, METH_VARARGS},
{"unicode_GET_CACHED_HASH", unicode_GET_CACHED_HASH, METH_O},
{"test_py_identifier", test_py_identifier, METH_NOARGS},
{NULL},
};

Expand Down
4 changes: 3 additions & 1 deletion Tools/c-analyzer/cpython/ignored.tsv
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,9 @@ Modules/clinic/grpmodule.c.h grp_getgrgid _keywords -
Modules/clinic/grpmodule.c.h grp_getgrnam _keywords -
Objects/object.c - constants static PyObject*[]
Objects/dictobject.c - PyFrozenDict_Type -

Modules/_testcapi/unicode.c test_py_identifier PyId_hello -
Modules/_testcapi/unicode.c test_py_identifier to_bytes_id -
Modules/_testcapi/unicode.c test_py_identifier real_id -

## False positives
Python/specialize.c - _Py_InitCleanup -
Expand Down
Loading

Back | FazBrowse Home | New Git URL