Commit79404e9

authored

Add Py_fopen() and Py_fclose() (#127)

1 parent7eb512b commit79404e9Copy full SHA for 79404e9

File tree

+66

-0

lines changed

+66

-0

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,14 @@ Python 3.14`
`169`	`169`
`170`	`170`	See `PyLong_FromUInt64() documentation <https://docs.python.org/dev/c-api/long.html#c.PyLong_FromUInt64>`__.
`171`	`171`
	`172`	`+.. c:function:: FILE* Py_fopen(PyObject path, const char mode)`
	`173`	`+`
	`174`	+ See `Py_fopen() documentation <https://docs.python.org/dev/c-api/sys.html#c.Py_fopen>`__.
	`175`	`+`
	`176`	`+.. c:function:: int Py_fclose(FILE *file)`
	`177`	`+`
	`178`	+ See `Py_fclose() documentation <https://docs.python.org/dev/c-api/sys.html#c.Py_fclose>`__.
	`179`	`+`
`172`	`180`
`173`	`181`	`Not supported:`
`174`	`182`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`Changelog`
`2`	`2`	`=========`
`3`	`3`
	`4`	+* 2025-01-06: Add ``Py_fopen()`` and ``Py_fclose()`` functions.
`4`	`5`	* 2024-12-16: Add ``structmember.h`` constants:
`5`	`6`
`6`	`7`	* ``Py_T_BOOL``

Lines changed: 41 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1933,6 +1933,47 @@ PyLongWriter_Finish(PyLongWriter *writer)`
`1933`	`1933`	`#endif`
`1934`	`1934`
`1935`	`1935`
	`1936`	`+// gh-127350 added Py_fopen() and Py_fclose() to Python 3.14a4`
	`1937`	`+#if PY_VERSION_HEX < 0x030E00A4`
	`1938`	`+staticinline FILEPy_fopen(PyObject path,constchar *mode)`
	`1939`	`+{`
	`1940`	`+#if 0x030400A2 <= PY_VERSION_HEX && !defined(PYPY_VERSION)`
	`1941`	`+extern FILE_Py_fopen_obj(PyObject path,constchar *mode);`
	`1942`	`+return_Py_fopen_obj(path, mode);`
	`1943`	`+#else`
	`1944`	`+ FILE *f;`
	`1945`	`+ PyObject *bytes;`
	`1946`	`+#if PY_VERSION_HEX >= 0x03000000`
	`1947`	`+if (!PyUnicode_FSConverter(path, &bytes)) {`
	`1948`	`+returnNULL;`
	`1949`	`+ }`
	`1950`	`+#else`
	`1951`	`+if (!PyString_Check(path)) {`
	`1952`	`+PyErr_SetString(PyExc_TypeError,"except str");`
	`1953`	`+returnNULL;`
	`1954`	`+ }`
	`1955`	`+ bytes =Py_NewRef(path);`
	`1956`	`+#endif`
	`1957`	`+constchar *path_bytes =PyBytes_AS_STRING(bytes);`
	`1958`	`+`
	`1959`	`+ f =fopen(path_bytes, mode);`
	`1960`	`+Py_DECREF(bytes);`
	`1961`	`+`
	`1962`	`+if (f ==NULL) {`
	`1963`	`+PyErr_SetFromErrnoWithFilenameObject(PyExc_OSError, path);`
	`1964`	`+returnNULL;`
	`1965`	`+ }`
	`1966`	`+return f;`
	`1967`	`+#endif`
	`1968`	`+}`
	`1969`	`+`
	`1970`	`+intPy_fclose(FILE *file)`
	`1971`	`+{`
	`1972`	`+returnfclose(file);`
	`1973`	`+}`
	`1974`	`+#endif`
	`1975`	`+`
	`1976`	`+`
`1936`	`1977`	`#ifdef __cplusplus`
`1937`	`1978`	`}`
`1938`	`1979`	`#endif`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2097,6 +2097,21 @@ test_structmember(PyObject Py_UNUSED(module), PyObject Py_UNUSED(args))`
`2097`	`2097`	`}`
`2098`	`2098`
`2099`	`2099`
	`2100`	`+staticPyObject*`
	`2101`	`+test_file(PyObjectPy_UNUSED(module),PyObjectPy_UNUSED(args))`
	`2102`	`+{`
	`2103`	`+constchar*filename=__FILE__;`
	`2104`	`+PyObject*path=create_string(filename);`
	`2105`	`+`
	`2106`	`+FILE*fp=Py_fopen(path,"rb");`
	`2107`	`+Py_DECREF(path);`
	`2108`	`+assert(fp!=NULL);`
	`2109`	`+Py_fclose(fp);`
	`2110`	`+`
	`2111`	`+Py_RETURN_NONE;`
	`2112`	`+}`
	`2113`	`+`
	`2114`	`+`
`2100`	`2115`	`staticstructPyMethodDefmethods[]= {`
`2101`	`2116`	`{"test_object",test_object,METH_NOARGS,_Py_NULL},`
`2102`	`2117`	`{"test_py_is",test_py_is,METH_NOARGS,_Py_NULL},`
`@@ -2144,6 +2159,7 @@ static struct PyMethodDef methods[] = {`
`2144`	`2159`	`{"test_iter",test_iter,METH_NOARGS,_Py_NULL},`
`2145`	`2160`	`{"test_long_stdint",test_long_stdint,METH_NOARGS,_Py_NULL},`
`2146`	`2161`	`{"test_structmember",test_structmember,METH_NOARGS,_Py_NULL},`
	`2162`	`+ {"test_file",test_file,METH_NOARGS,_Py_NULL},`
`2147`	`2163`	`{_Py_NULL,_Py_NULL,0,_Py_NULL}`
`2148`	`2164`	`};`
`2149`	`2165`

Comments

(0)