[Python-checkins] [3.11] gh-107735: Add C API tests for PySys_GetObject() and PySys_SetObject() (GH-107736) (GH-107741)
serhiy-storchaka
webhook-mailer at python.org
Mon Aug 7 16:51:05 EDT 2023
https://github.com/python/cpython/commit/22b39d13eccb965515e3a4b3fd358755f8db9d7f
commit: 22b39d13eccb965515e3a4b3fd358755f8db9d7f
branch: 3.11
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2023-08-07T20:51:00Z
summary:
[3.11] gh-107735: Add C API tests for PySys_GetObject() and PySys_SetObject() (GH-107736) (GH-107741)
(cherry picked from commit bea5f93196d213d6fbf4ba8984caf4c3cd1da882)
files:
M Lib/test/test_capi/test_misc.py
M Modules/_testcapimodule.c
diff --git a/Lib/test/test_capi/test_misc.py b/Lib/test/test_capi/test_misc.py
index 3e36fbde8c66d..341b3b79091ae 100644
--- a/Lib/test/test_capi/test_misc.py
+++ b/Lib/test/test_capi/test_misc.py
@@ -3,6 +3,7 @@
from collections import OrderedDict
import _thread
+import contextlib
import importlib.machinery
import importlib.util
import os
@@ -40,6 +41,8 @@
Py_DEBUG = hasattr(sys, 'gettotalrefcount')
+NULL = None
+
def decode_stderr(err):
return err.decode('utf-8', 'replace').replace('\r', '')
@@ -910,6 +913,46 @@ def some():
with self.assertRaises(SystemError):
_testcapi.function_get_module(None) # not a function
+ def test_sys_getobject(self):
+ getobject = _testcapi.sys_getobject
+
+ self.assertIs(getobject(b'stdout'), sys.stdout)
+ with support.swap_attr(sys, '\U0001f40d', 42):
+ self.assertEqual(getobject('\U0001f40d'.encode()), 42)
+
+ self.assertIs(getobject(b'nonexisting'), AttributeError)
+ self.assertIs(getobject(b'\xff'), AttributeError)
+ # CRASHES getobject(NULL)
+
+ def test_sys_setobject(self):
+ setobject = _testcapi.sys_setobject
+
+ value = ['value']
+ value2 = ['value2']
+ try:
+ self.assertEqual(setobject(b'newattr', value), 0)
+ self.assertIs(sys.newattr, value)
+ self.assertEqual(setobject(b'newattr', value2), 0)
+ self.assertIs(sys.newattr, value2)
+ self.assertEqual(setobject(b'newattr', NULL), 0)
+ self.assertFalse(hasattr(sys, 'newattr'))
+ self.assertEqual(setobject(b'newattr', NULL), 0)
+ finally:
+ with contextlib.suppress(AttributeError):
+ del sys.newattr
+ try:
+ self.assertEqual(setobject('\U0001f40d'.encode(), value), 0)
+ self.assertIs(getattr(sys, '\U0001f40d'), value)
+ self.assertEqual(setobject('\U0001f40d'.encode(), NULL), 0)
+ self.assertFalse(hasattr(sys, '\U0001f40d'))
+ finally:
+ with contextlib.suppress(AttributeError):
+ delattr(sys, '\U0001f40d')
+
+ with self.assertRaises(UnicodeDecodeError):
+ setobject(b'\xff', value)
+ # CRASHES setobject(NULL, value)
+
class TestPendingCalls(unittest.TestCase):
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index b29a919a8325b..5c00b48001a91 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -44,6 +44,16 @@
# error "The public headers should not include <stdbool.h>, see bpo-46748"
#endif
+#define NULLABLE(x) do { if (x == Py_None) x = NULL; } while (0);
+
+#define RETURN_INT(value) do { \
+ int _ret = (value); \
+ if (_ret == -1) { \
+ return NULL; \
+ } \
+ return PyLong_FromLong(_ret); \
+ } while (0)
+
// Forward declarations
static struct PyModuleDef _testcapimodule;
static PyType_Spec HeapTypeNameType_Spec;
@@ -6449,6 +6459,35 @@ static PyObject *getargs_s_hash_int(PyObject *, PyObject *, PyObject*);
static PyObject *getargs_s_hash_int2(PyObject *, PyObject *, PyObject*);
static PyObject *gh_99240_clear_args(PyObject *, PyObject *);
+static PyObject *
+sys_getobject(PyObject *Py_UNUSED(module), PyObject *arg)
+{
+ const char *name;
+ Py_ssize_t size;
+ if (!PyArg_Parse(arg, "z#", &name, &size)) {
+ return NULL;
+ }
+ PyObject *result = PySys_GetObject(name);
+ if (result == NULL) {
+ result = PyExc_AttributeError;
+ }
+ return Py_NewRef(result);
+}
+
+static PyObject *
+sys_setobject(PyObject *Py_UNUSED(module), PyObject *args)
+{
+ const char *name;
+ Py_ssize_t size;
+ PyObject *value;
+ if (!PyArg_ParseTuple(args, "z#O", &name, &size, &value)) {
+ return NULL;
+ }
+ NULLABLE(value);
+ RETURN_INT(PySys_SetObject(name, value));
+}
+
+
static PyMethodDef TestMethods[] = {
{"exc_set_object", exc_set_object, METH_VARARGS},
{"raise_exception", raise_exception, METH_VARARGS},
@@ -6761,6 +6800,8 @@ static PyMethodDef TestMethods[] = {
{"function_get_code", function_get_code, METH_O, NULL},
{"function_get_globals", function_get_globals, METH_O, NULL},
{"function_get_module", function_get_module, METH_O, NULL},
+ {"sys_getobject", sys_getobject, METH_O},
+ {"sys_setobject", sys_setobject, METH_VARARGS},
{NULL, NULL} /* sentinel */
};
More information about the Python-checkins
mailing list