From 7055a432f11ca811e32dbb85899d74dcba70f810 Mon Sep 17 00:00:00 2001 From: monadchains Date: Thu, 27 Oct 2022 01:11:58 +0200 Subject: [PATCH 1/6] Improve coverage of PyObject_Print --- Lib/test/test_class.py | 71 +++++++++++++++++++++++++ Modules/_testcapimodule.c | 107 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 178 insertions(+) diff --git a/Lib/test/test_class.py b/Lib/test/test_class.py index 61df81b169775e..eb26cb5591ceb5 100644 --- a/Lib/test/test_class.py +++ b/Lib/test/test_class.py @@ -740,6 +740,77 @@ class A(0, 1, 2, 3, 4, 5, 6, 7, **d): pass class A(0, *range(1, 8), **d, foo='bar'): pass self.assertEqual(A, (tuple(range(8)), {'foo': 'bar'})) + def testPyObjectPrintObject(self): + import os + import test.support.os_helper as os_helper + from test.support import import_helper + + _testcapi = import_helper.import_module('_testcapi') + + class PrintableObject: + + def __repr__(self): + return "spam spam spam" + + def __str__(self): + return "egg egg egg" + + obj = PrintableObject() + output_filename = os_helper.TESTFN + # Test repr printing + _testcapi.call_pyobject_print(obj, output_filename, False) + with open(output_filename, 'r') as output_file: + self.assertEqual(output_file.read(), repr(obj)) + # Test str printing + _testcapi.call_pyobject_print(obj, output_filename, True) + with open(output_filename, 'r') as output_file: + self.assertEqual(output_file.read(), str(obj)) + + os.remove(output_filename) + + def testPyObjectPrintNULL(self): + import os + import test.support.os_helper as os_helper + from test.support import import_helper + + _testcapi = import_helper.import_module('_testcapi') + + output_filename = os_helper.TESTFN + # Test repr printing + _testcapi.pyobject_print_null(output_filename) + with open(output_filename, 'r') as output_file: + self.assertEqual(output_file.read(), '') + + os.remove(output_filename) + + def testPyObjectPrintNoRefObject(self): + import os + import test.support.os_helper as os_helper + from test.support import import_helper + + _testcapi = import_helper.import_module('_testcapi') + + output_filename = os_helper.TESTFN + # Test repr printing + correct_output = _testcapi.pyobject_print_noref_object(output_filename) + with open(output_filename, 'r') as output_file: + self.assertEqual(output_file.read(), correct_output) + + os.remove(output_filename) + + def testPyObjectPrintOSError(self): + import os + import test.support.os_helper as os_helper + from test.support import import_helper + + _testcapi = import_helper.import_module('_testcapi') + + output_filename = os_helper.TESTFN + open(output_filename, "w+").close() + with self.assertRaises(OSError): + _testcapi.pyobject_print_os_error(output_filename) + + os.remove(output_filename) if __name__ == '__main__': unittest.main() diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index fdf2f204acb29b..fd6cd3c55c0a0a 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -2001,6 +2001,109 @@ pyobject_bytes_from_null(PyObject *self, PyObject *Py_UNUSED(ignored)) return PyObject_Bytes(NULL); } +static PyObject * +call_pyobject_print(PyObject *self, PyObject * args) +{ + PyObject *object; + PyObject *filename; + PyObject *print_raw; + FILE *fp; + int flags = 0; + + if (!PyArg_UnpackTuple(args, "call_pyobject_print", 3, 3, &object, &filename, &print_raw)) { + return NULL; + } + + fp = _Py_fopen_obj(filename, "w+"); + + if (Py_IsTrue(print_raw)) { + flags = Py_PRINT_RAW; + } + + if (PyObject_Print(object, fp, flags) < 0) { + return NULL; + } + + fclose(fp); + + Py_RETURN_NONE; +} + +static PyObject * +pyobject_print_null(PyObject *self, PyObject *args) +{ + PyObject *filename; + FILE *fp; + + if (!PyArg_UnpackTuple(args, "call_pyobject_print", 1, 1, &filename)) { + return NULL; + } + + fp = _Py_fopen_obj(filename, "w+"); + + if (PyObject_Print(NULL, fp, 0) < 0) { + return NULL; + } + + fclose(fp); + + Py_RETURN_NONE; +} + +static PyObject * +pyobject_print_noref_object(PyObject *self, PyObject *args) +{ + PyObject *test_string; + PyObject *filename; + FILE *fp; + char correct_string[100]; + + test_string = PyUnicode_FromString("Spam spam spam"); + + Py_DECREF(test_string); + + snprintf(correct_string, 100, "", Py_REFCNT(test_string), (void *)test_string); + + if (!PyArg_UnpackTuple(args, "call_pyobject_print", 1, 1, &filename)) { + return NULL; + } + + fp = _Py_fopen_obj(filename, "w+"); + + if (PyObject_Print(test_string, fp, 0) < 0){ + return NULL; + } + + fclose(fp); + + return PyUnicode_FromString(correct_string); +} + +static PyObject * +pyobject_print_os_error(PyObject *self, PyObject *args) +{ + PyObject *test_string; + PyObject *filename; + FILE *fp; + + test_string = PyUnicode_FromString("Spam spam spam"); + + if (!PyArg_UnpackTuple(args, "call_pyobject_print", 1, 1, &filename)) { + return NULL; + } + + // open file in read mode to induce OSError + fp = _Py_fopen_obj(filename, "r"); + + if (PyObject_Print(test_string, fp, 0) < 0) { + return NULL; + } + + fclose(fp); + + Py_RETURN_NONE; +} + static PyObject * raise_exception(PyObject *self, PyObject *args) { @@ -5969,6 +6072,10 @@ static PyMethodDef TestMethods[] = { {"pyobject_repr_from_null", pyobject_repr_from_null, METH_NOARGS}, {"pyobject_str_from_null", pyobject_str_from_null, METH_NOARGS}, {"pyobject_bytes_from_null", pyobject_bytes_from_null, METH_NOARGS}, + {"call_pyobject_print", call_pyobject_print, METH_VARARGS}, + {"pyobject_print_null", pyobject_print_null, METH_VARARGS}, + {"pyobject_print_noref_object", pyobject_print_noref_object, METH_VARARGS}, + {"pyobject_print_os_error", pyobject_print_os_error, METH_VARARGS}, {"test_with_docstring", test_with_docstring, METH_NOARGS, PyDoc_STR("This is a pretty normal docstring.")}, {"test_string_to_double", test_string_to_double, METH_NOARGS}, From 25c24e4e724680b438e78e2e40498c9688c737bd Mon Sep 17 00:00:00 2001 From: monadchains Date: Fri, 28 Oct 2022 17:35:26 +0200 Subject: [PATCH 2/6] Close file when error is returned --- Modules/_testcapimodule.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index 5ba88ff01a2d05..dadee829db0c21 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -2021,6 +2021,7 @@ call_pyobject_print(PyObject *self, PyObject * args) } if (PyObject_Print(object, fp, flags) < 0) { + fclose(fp); return NULL; } @@ -2042,6 +2043,7 @@ pyobject_print_null(PyObject *self, PyObject *args) fp = _Py_fopen_obj(filename, "w+"); if (PyObject_Print(NULL, fp, 0) < 0) { + fclose(fp); return NULL; } @@ -2071,6 +2073,7 @@ pyobject_print_noref_object(PyObject *self, PyObject *args) fp = _Py_fopen_obj(filename, "w+"); if (PyObject_Print(test_string, fp, 0) < 0){ + fclose(fp); return NULL; } @@ -2096,6 +2099,7 @@ pyobject_print_os_error(PyObject *self, PyObject *args) fp = _Py_fopen_obj(filename, "r"); if (PyObject_Print(test_string, fp, 0) < 0) { + fclose(fp); return NULL; } From 2202e4a6dea2afb2ae1fe5025c3cb026bd525411 Mon Sep 17 00:00:00 2001 From: monadchains Date: Tue, 1 Nov 2022 23:28:09 +0100 Subject: [PATCH 3/6] Rework negative reference test --- Modules/_testcapimodule.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index e37a8f61ea44d8..6ba99ff6de38fd 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -2062,7 +2062,7 @@ pyobject_print_noref_object(PyObject *self, PyObject *args) test_string = PyUnicode_FromString("Spam spam spam"); - Py_DECREF(test_string); + test_string -> ob_refcnt = 0; snprintf(correct_string, 100, "", Py_REFCNT(test_string), (void *)test_string); @@ -2079,6 +2079,9 @@ pyobject_print_noref_object(PyObject *self, PyObject *args) fclose(fp); + test_string -> ob_refcnt = 1; + Py_DECREF(test_string); + return PyUnicode_FromString(correct_string); } From abf998e373b31fb9943d1519032b6f9d896210af Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Mon, 25 Mar 2024 15:36:29 +0100 Subject: [PATCH 4/6] Move the new tests --- Lib/test/test_capi/test_object.py | 68 +++++++++++++++- Lib/test/test_class.py | 73 ----------------- Modules/Setup.stdlib.in | 2 +- Modules/_testcapi/object.c | 131 ++++++++++++++++++++++++++++++ Modules/_testcapi/parts.h | 1 + Modules/_testcapimodule.c | 117 +------------------------- PCbuild/_testcapi.vcxproj | 1 + PCbuild/_testcapi.vcxproj.filters | 3 + 8 files changed, 207 insertions(+), 189 deletions(-) create mode 100644 Modules/_testcapi/object.c diff --git a/Lib/test/test_capi/test_object.py b/Lib/test/test_capi/test_object.py index c80e9b653789ad..912ab331d50aae 100644 --- a/Lib/test/test_capi/test_object.py +++ b/Lib/test/test_capi/test_object.py @@ -3,6 +3,7 @@ from test.support import import_helper _testlimitedcapi = import_helper.import_module('_testlimitedcapi') +_testcapi = import_helper.import_module('_testcapi') class Constant(enum.IntEnum): @@ -20,7 +21,7 @@ class Constant(enum.IntEnum): INVALID_CONSTANT = Py_CONSTANT_EMPTY_TUPLE + 1 -class CAPITest(unittest.TestCase): +class GetConstantTest(unittest.TestCase): def check_get_constant(self, get_constant): self.assertIs(get_constant(Constant.Py_CONSTANT_NONE), None) self.assertIs(get_constant(Constant.Py_CONSTANT_FALSE), False) @@ -50,5 +51,70 @@ def test_get_constant_borrowed(self): self.check_get_constant(_testlimitedcapi.get_constant_borrowed) +class PrintTest(unittest.TestCase): + def testPyObjectPrintObject(self): + import os + import test.support.os_helper as os_helper + from test.support import import_helper + + class PrintableObject: + + def __repr__(self): + return "spam spam spam" + + def __str__(self): + return "egg egg egg" + + obj = PrintableObject() + output_filename = os_helper.TESTFN + # Test repr printing + _testcapi.call_pyobject_print(obj, output_filename, False) + with open(output_filename, 'r') as output_file: + self.assertEqual(output_file.read(), repr(obj)) + # Test str printing + _testcapi.call_pyobject_print(obj, output_filename, True) + with open(output_filename, 'r') as output_file: + self.assertEqual(output_file.read(), str(obj)) + + os.remove(output_filename) + + def testPyObjectPrintNULL(self): + import os + import test.support.os_helper as os_helper + from test.support import import_helper + + output_filename = os_helper.TESTFN + # Test repr printing + _testcapi.pyobject_print_null(output_filename) + with open(output_filename, 'r') as output_file: + self.assertEqual(output_file.read(), '') + + os.remove(output_filename) + + def testPyObjectPrintNoRefObject(self): + import os + import test.support.os_helper as os_helper + from test.support import import_helper + + output_filename = os_helper.TESTFN + # Test repr printing + correct_output = _testcapi.pyobject_print_noref_object(output_filename) + with open(output_filename, 'r') as output_file: + self.assertEqual(output_file.read(), correct_output) + + os.remove(output_filename) + + def testPyObjectPrintOSError(self): + import os + import test.support.os_helper as os_helper + from test.support import import_helper + + output_filename = os_helper.TESTFN + open(output_filename, "w+").close() + with self.assertRaises(OSError): + _testcapi.pyobject_print_os_error(output_filename) + + os.remove(output_filename) + if __name__ == "__main__": unittest.main() diff --git a/Lib/test/test_class.py b/Lib/test/test_class.py index 293a6d6c1a34f7..0cf06243dc8da0 100644 --- a/Lib/test/test_class.py +++ b/Lib/test/test_class.py @@ -789,78 +789,5 @@ def __init__(self, obj): self.assertEqual(calls, 100) - def testPyObjectPrintObject(self): - import os - import test.support.os_helper as os_helper - from test.support import import_helper - - _testcapi = import_helper.import_module('_testcapi') - - class PrintableObject: - - def __repr__(self): - return "spam spam spam" - - def __str__(self): - return "egg egg egg" - - obj = PrintableObject() - output_filename = os_helper.TESTFN - # Test repr printing - _testcapi.call_pyobject_print(obj, output_filename, False) - with open(output_filename, 'r') as output_file: - self.assertEqual(output_file.read(), repr(obj)) - # Test str printing - _testcapi.call_pyobject_print(obj, output_filename, True) - with open(output_filename, 'r') as output_file: - self.assertEqual(output_file.read(), str(obj)) - - os.remove(output_filename) - - def testPyObjectPrintNULL(self): - import os - import test.support.os_helper as os_helper - from test.support import import_helper - - _testcapi = import_helper.import_module('_testcapi') - - output_filename = os_helper.TESTFN - # Test repr printing - _testcapi.pyobject_print_null(output_filename) - with open(output_filename, 'r') as output_file: - self.assertEqual(output_file.read(), '') - - os.remove(output_filename) - - def testPyObjectPrintNoRefObject(self): - import os - import test.support.os_helper as os_helper - from test.support import import_helper - - _testcapi = import_helper.import_module('_testcapi') - - output_filename = os_helper.TESTFN - # Test repr printing - correct_output = _testcapi.pyobject_print_noref_object(output_filename) - with open(output_filename, 'r') as output_file: - self.assertEqual(output_file.read(), correct_output) - - os.remove(output_filename) - - def testPyObjectPrintOSError(self): - import os - import test.support.os_helper as os_helper - from test.support import import_helper - - _testcapi = import_helper.import_module('_testcapi') - - output_filename = os_helper.TESTFN - open(output_filename, "w+").close() - with self.assertRaises(OSError): - _testcapi.pyobject_print_os_error(output_filename) - - os.remove(output_filename) - - if __name__ == '__main__': unittest.main() diff --git a/Modules/Setup.stdlib.in b/Modules/Setup.stdlib.in index 09d6f3b2bb7e8d..047b28a5ec251a 100644 --- a/Modules/Setup.stdlib.in +++ b/Modules/Setup.stdlib.in @@ -162,7 +162,7 @@ @MODULE__XXTESTFUZZ_TRUE@_xxtestfuzz _xxtestfuzz/_xxtestfuzz.c _xxtestfuzz/fuzzer.c @MODULE__TESTBUFFER_TRUE@_testbuffer _testbuffer.c @MODULE__TESTINTERNALCAPI_TRUE@_testinternalcapi _testinternalcapi.c _testinternalcapi/test_lock.c _testinternalcapi/pytime.c _testinternalcapi/set.c _testinternalcapi/test_critical_sections.c -@MODULE__TESTCAPI_TRUE@_testcapi _testcapimodule.c _testcapi/vectorcall.c _testcapi/heaptype.c _testcapi/abstract.c _testcapi/unicode.c _testcapi/dict.c _testcapi/set.c _testcapi/list.c _testcapi/tuple.c _testcapi/getargs.c _testcapi/datetime.c _testcapi/docstring.c _testcapi/mem.c _testcapi/watchers.c _testcapi/long.c _testcapi/float.c _testcapi/complex.c _testcapi/numbers.c _testcapi/structmember.c _testcapi/exceptions.c _testcapi/code.c _testcapi/buffer.c _testcapi/pyatomic.c _testcapi/file.c _testcapi/codec.c _testcapi/immortal.c _testcapi/gc.c _testcapi/hash.c _testcapi/time.c +@MODULE__TESTCAPI_TRUE@_testcapi _testcapimodule.c _testcapi/vectorcall.c _testcapi/heaptype.c _testcapi/abstract.c _testcapi/unicode.c _testcapi/dict.c _testcapi/set.c _testcapi/list.c _testcapi/tuple.c _testcapi/getargs.c _testcapi/datetime.c _testcapi/docstring.c _testcapi/mem.c _testcapi/watchers.c _testcapi/long.c _testcapi/float.c _testcapi/complex.c _testcapi/numbers.c _testcapi/structmember.c _testcapi/exceptions.c _testcapi/code.c _testcapi/buffer.c _testcapi/pyatomic.c _testcapi/file.c _testcapi/codec.c _testcapi/immortal.c _testcapi/gc.c _testcapi/hash.c _testcapi/time.c _testcapi/object.c @MODULE__TESTLIMITEDCAPI_TRUE@_testlimitedcapi _testlimitedcapi.c _testlimitedcapi/abstract.c _testlimitedcapi/bytearray.c _testlimitedcapi/bytes.c _testlimitedcapi/complex.c _testlimitedcapi/dict.c _testlimitedcapi/float.c _testlimitedcapi/heaptype_relative.c _testlimitedcapi/list.c _testlimitedcapi/long.c _testlimitedcapi/object.c _testlimitedcapi/pyos.c _testlimitedcapi/set.c _testlimitedcapi/sys.c _testlimitedcapi/unicode.c _testlimitedcapi/vectorcall_limited.c @MODULE__TESTCLINIC_TRUE@_testclinic _testclinic.c @MODULE__TESTCLINIC_LIMITED_TRUE@_testclinic_limited _testclinic_limited.c diff --git a/Modules/_testcapi/object.c b/Modules/_testcapi/object.c new file mode 100644 index 00000000000000..77178c448754f9 --- /dev/null +++ b/Modules/_testcapi/object.c @@ -0,0 +1,131 @@ +#include "parts.h" +#include "util.h" + +static PyObject * +call_pyobject_print(PyObject *self, PyObject * args) +{ + PyObject *object; + PyObject *filename; + PyObject *print_raw; + FILE *fp; + int flags = 0; + + if (!PyArg_UnpackTuple(args, "call_pyobject_print", 3, 3, &object, &filename, &print_raw)) { + return NULL; + } + + fp = _Py_fopen_obj(filename, "w+"); + + if (Py_IsTrue(print_raw)) { + flags = Py_PRINT_RAW; + } + + if (PyObject_Print(object, fp, flags) < 0) { + fclose(fp); + return NULL; + } + + fclose(fp); + + Py_RETURN_NONE; +} + +static PyObject * +pyobject_print_null(PyObject *self, PyObject *args) +{ + PyObject *filename; + FILE *fp; + + if (!PyArg_UnpackTuple(args, "call_pyobject_print", 1, 1, &filename)) { + return NULL; + } + + fp = _Py_fopen_obj(filename, "w+"); + + if (PyObject_Print(NULL, fp, 0) < 0) { + fclose(fp); + return NULL; + } + + fclose(fp); + + Py_RETURN_NONE; +} + +static PyObject * +pyobject_print_noref_object(PyObject *self, PyObject *args) +{ + PyObject *test_string; + PyObject *filename; + FILE *fp; + char correct_string[100]; + + test_string = PyUnicode_FromString("Spam spam spam"); + + test_string -> ob_refcnt = 0; + + snprintf(correct_string, 100, "", Py_REFCNT(test_string), (void *)test_string); + + if (!PyArg_UnpackTuple(args, "call_pyobject_print", 1, 1, &filename)) { + return NULL; + } + + fp = _Py_fopen_obj(filename, "w+"); + + if (PyObject_Print(test_string, fp, 0) < 0){ + fclose(fp); + return NULL; + } + + fclose(fp); + + test_string -> ob_refcnt = 1; + Py_DECREF(test_string); + + return PyUnicode_FromString(correct_string); +} + +static PyObject * +pyobject_print_os_error(PyObject *self, PyObject *args) +{ + PyObject *test_string; + PyObject *filename; + FILE *fp; + + test_string = PyUnicode_FromString("Spam spam spam"); + + if (!PyArg_UnpackTuple(args, "call_pyobject_print", 1, 1, &filename)) { + return NULL; + } + + // open file in read mode to induce OSError + fp = _Py_fopen_obj(filename, "r"); + + if (PyObject_Print(test_string, fp, 0) < 0) { + fclose(fp); + return NULL; + } + + fclose(fp); + + Py_RETURN_NONE; +} + +static PyMethodDef test_methods[] = { + {"call_pyobject_print", call_pyobject_print, METH_VARARGS}, + {"pyobject_print_null", pyobject_print_null, METH_VARARGS}, + {"pyobject_print_noref_object", pyobject_print_noref_object, METH_VARARGS}, + {"pyobject_print_os_error", pyobject_print_os_error, METH_VARARGS}, + + {NULL}, +}; + +int +_PyTestCapi_Init_Object(PyObject *m) +{ + if (PyModule_AddFunctions(m, test_methods) < 0) { + return -1; + } + + return 0; +} diff --git a/Modules/_testcapi/parts.h b/Modules/_testcapi/parts.h index f9bdd830775a75..338dc4c54d8f4e 100644 --- a/Modules/_testcapi/parts.h +++ b/Modules/_testcapi/parts.h @@ -56,5 +56,6 @@ int _PyTestCapi_Init_Immortal(PyObject *module); int _PyTestCapi_Init_GC(PyObject *module); int _PyTestCapi_Init_Hash(PyObject *module); int _PyTestCapi_Init_Time(PyObject *module); +int _PyTestCapi_Init_Object(PyObject *module); #endif // Py_TESTCAPI_PARTS_H diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index da3d88e5bf8567..82e72bf6b0c90e 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -671,116 +671,6 @@ pyobject_bytes_from_null(PyObject *self, PyObject *Py_UNUSED(ignored)) return PyObject_Bytes(NULL); } -static PyObject * -call_pyobject_print(PyObject *self, PyObject * args) -{ - PyObject *object; - PyObject *filename; - PyObject *print_raw; - FILE *fp; - int flags = 0; - - if (!PyArg_UnpackTuple(args, "call_pyobject_print", 3, 3, &object, &filename, &print_raw)) { - return NULL; - } - - fp = _Py_fopen_obj(filename, "w+"); - - if (Py_IsTrue(print_raw)) { - flags = Py_PRINT_RAW; - } - - if (PyObject_Print(object, fp, flags) < 0) { - fclose(fp); - return NULL; - } - - fclose(fp); - - Py_RETURN_NONE; -} - -static PyObject * -pyobject_print_null(PyObject *self, PyObject *args) -{ - PyObject *filename; - FILE *fp; - - if (!PyArg_UnpackTuple(args, "call_pyobject_print", 1, 1, &filename)) { - return NULL; - } - - fp = _Py_fopen_obj(filename, "w+"); - - if (PyObject_Print(NULL, fp, 0) < 0) { - fclose(fp); - return NULL; - } - - fclose(fp); - - Py_RETURN_NONE; -} - -static PyObject * -pyobject_print_noref_object(PyObject *self, PyObject *args) -{ - PyObject *test_string; - PyObject *filename; - FILE *fp; - char correct_string[100]; - - test_string = PyUnicode_FromString("Spam spam spam"); - - test_string -> ob_refcnt = 0; - - snprintf(correct_string, 100, "", Py_REFCNT(test_string), (void *)test_string); - - if (!PyArg_UnpackTuple(args, "call_pyobject_print", 1, 1, &filename)) { - return NULL; - } - - fp = _Py_fopen_obj(filename, "w+"); - - if (PyObject_Print(test_string, fp, 0) < 0){ - fclose(fp); - return NULL; - } - - fclose(fp); - - test_string -> ob_refcnt = 1; - Py_DECREF(test_string); - - return PyUnicode_FromString(correct_string); -} - -static PyObject * -pyobject_print_os_error(PyObject *self, PyObject *args) -{ - PyObject *test_string; - PyObject *filename; - FILE *fp; - - test_string = PyUnicode_FromString("Spam spam spam"); - - if (!PyArg_UnpackTuple(args, "call_pyobject_print", 1, 1, &filename)) { - return NULL; - } - - // open file in read mode to induce OSError - fp = _Py_fopen_obj(filename, "r"); - - if (PyObject_Print(test_string, fp, 0) < 0) { - fclose(fp); - return NULL; - } - - fclose(fp); - - Py_RETURN_NONE; -} - static PyObject * set_errno(PyObject *self, PyObject *args) { @@ -3366,10 +3256,6 @@ static PyMethodDef TestMethods[] = { {"pyobject_repr_from_null", pyobject_repr_from_null, METH_NOARGS}, {"pyobject_str_from_null", pyobject_str_from_null, METH_NOARGS}, {"pyobject_bytes_from_null", pyobject_bytes_from_null, METH_NOARGS}, - {"call_pyobject_print", call_pyobject_print, METH_VARARGS}, - {"pyobject_print_null", pyobject_print_null, METH_VARARGS}, - {"pyobject_print_noref_object", pyobject_print_noref_object, METH_VARARGS}, - {"pyobject_print_os_error", pyobject_print_os_error, METH_VARARGS}, {"test_string_to_double", test_string_to_double, METH_NOARGS}, {"test_capsule", (PyCFunction)test_capsule, METH_NOARGS}, {"test_from_contiguous", (PyCFunction)test_from_contiguous, METH_NOARGS}, @@ -4160,6 +4046,9 @@ PyInit__testcapi(void) if (_PyTestCapi_Init_Time(m) < 0) { return NULL; } + if (_PyTestCapi_Init_Object(m) < 0) { + return NULL; + } PyState_AddModule(m, &_testcapimodule); return m; diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj index 6522cb1fcf5c63..955c0989e919ba 100644 --- a/PCbuild/_testcapi.vcxproj +++ b/PCbuild/_testcapi.vcxproj @@ -120,6 +120,7 @@ + diff --git a/PCbuild/_testcapi.vcxproj.filters b/PCbuild/_testcapi.vcxproj.filters index 772a9a861517ec..d21ebd19ffb758 100644 --- a/PCbuild/_testcapi.vcxproj.filters +++ b/PCbuild/_testcapi.vcxproj.filters @@ -96,6 +96,9 @@ Source Files + + Source Files + Source Files From d8e2e0ee53b5950e683bf74ea687db727cb653ac Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Mon, 25 Mar 2024 15:44:58 +0100 Subject: [PATCH 5/6] Nitpicks - Use test helpers - Use PyOS_snprintf - Touch up formatting (PEP 7) --- Lib/test/test_capi/test_object.py | 33 ++++++++++--------------------- Modules/_testcapi/object.c | 10 ++++++---- 2 files changed, 16 insertions(+), 27 deletions(-) diff --git a/Lib/test/test_capi/test_object.py b/Lib/test/test_capi/test_object.py index 912ab331d50aae..fa23bff4e98918 100644 --- a/Lib/test/test_capi/test_object.py +++ b/Lib/test/test_capi/test_object.py @@ -1,6 +1,7 @@ import enum import unittest from test.support import import_helper +from test.support import os_helper _testlimitedcapi = import_helper.import_module('_testlimitedcapi') _testcapi = import_helper.import_module('_testcapi') @@ -53,9 +54,6 @@ def test_get_constant_borrowed(self): class PrintTest(unittest.TestCase): def testPyObjectPrintObject(self): - import os - import test.support.os_helper as os_helper - from test.support import import_helper class PrintableObject: @@ -67,54 +65,43 @@ def __str__(self): obj = PrintableObject() output_filename = os_helper.TESTFN + self.addCleanup(os_helper.unlink, output_filename) + # Test repr printing _testcapi.call_pyobject_print(obj, output_filename, False) with open(output_filename, 'r') as output_file: self.assertEqual(output_file.read(), repr(obj)) + # Test str printing _testcapi.call_pyobject_print(obj, output_filename, True) with open(output_filename, 'r') as output_file: self.assertEqual(output_file.read(), str(obj)) - os.remove(output_filename) - def testPyObjectPrintNULL(self): - import os - import test.support.os_helper as os_helper - from test.support import import_helper - output_filename = os_helper.TESTFN + self.addCleanup(os_helper.unlink, output_filename) + # Test repr printing _testcapi.pyobject_print_null(output_filename) with open(output_filename, 'r') as output_file: self.assertEqual(output_file.read(), '') - os.remove(output_filename) - def testPyObjectPrintNoRefObject(self): - import os - import test.support.os_helper as os_helper - from test.support import import_helper - output_filename = os_helper.TESTFN + self.addCleanup(os_helper.unlink, output_filename) + # Test repr printing correct_output = _testcapi.pyobject_print_noref_object(output_filename) with open(output_filename, 'r') as output_file: self.assertEqual(output_file.read(), correct_output) - os.remove(output_filename) - def testPyObjectPrintOSError(self): - import os - import test.support.os_helper as os_helper - from test.support import import_helper - output_filename = os_helper.TESTFN + self.addCleanup(os_helper.unlink, output_filename) + open(output_filename, "w+").close() with self.assertRaises(OSError): _testcapi.pyobject_print_os_error(output_filename) - os.remove(output_filename) - if __name__ == "__main__": unittest.main() diff --git a/Modules/_testcapi/object.c b/Modules/_testcapi/object.c index 77178c448754f9..c8c881f1e6a22b 100644 --- a/Modules/_testcapi/object.c +++ b/Modules/_testcapi/object.c @@ -10,7 +10,8 @@ call_pyobject_print(PyObject *self, PyObject * args) FILE *fp; int flags = 0; - if (!PyArg_UnpackTuple(args, "call_pyobject_print", 3, 3, &object, &filename, &print_raw)) { + if (!PyArg_UnpackTuple(args, "call_pyobject_print", 3, 3, + &object, &filename, &print_raw)) { return NULL; } @@ -62,9 +63,10 @@ pyobject_print_noref_object(PyObject *self, PyObject *args) test_string = PyUnicode_FromString("Spam spam spam"); - test_string -> ob_refcnt = 0; + test_string->ob_refcnt = 0; - snprintf(correct_string, 100, "", Py_REFCNT(test_string), (void *)test_string); + PyOS_snprintf(correct_string, 100, "", + Py_REFCNT(test_string), (void *)test_string); if (!PyArg_UnpackTuple(args, "call_pyobject_print", 1, 1, &filename)) { return NULL; @@ -79,7 +81,7 @@ pyobject_print_noref_object(PyObject *self, PyObject *args) fclose(fp); - test_string -> ob_refcnt = 1; + test_string->ob_refcnt = 1; Py_DECREF(test_string); return PyUnicode_FromString(correct_string); From 355e8e43102c3fc8a04e60b51e4df37a6fc89caf Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Mon, 25 Mar 2024 15:56:00 +0100 Subject: [PATCH 6/6] Use Py_SET_REFCNT rather than ob_refcnt --- Modules/_testcapi/object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/_testcapi/object.c b/Modules/_testcapi/object.c index c8c881f1e6a22b..ce5b574ec5ce8f 100644 --- a/Modules/_testcapi/object.c +++ b/Modules/_testcapi/object.c @@ -63,7 +63,7 @@ pyobject_print_noref_object(PyObject *self, PyObject *args) test_string = PyUnicode_FromString("Spam spam spam"); - test_string->ob_refcnt = 0; + Py_SET_REFCNT(test_string, 0); PyOS_snprintf(correct_string, 100, "", Py_REFCNT(test_string), (void *)test_string); @@ -81,7 +81,7 @@ pyobject_print_noref_object(PyObject *self, PyObject *args) fclose(fp); - test_string->ob_refcnt = 1; + Py_SET_REFCNT(test_string, 1); Py_DECREF(test_string); return PyUnicode_FromString(correct_string);