Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitaba99a8

Browse files
committed
gh-132162: tests for py_universalnewlinefgets
1 parent2433cc7 commitaba99a8

File tree

3 files changed

+100
-2
lines changed

3 files changed

+100
-2
lines changed

‎Lib/test/test_capi/test_file.py

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,28 @@ def test_py_fopen(self):
294294
# CRASHES py_fopen(NULL, 'rb')
295295
# CRASHES py_fopen(__file__, NULL)
296296

297-
# TODO: Test Py_UniversalNewlineFgets()
297+
deftest_py_universalnewlinefgets(self):
298+
py_universalnewlinefgets=_testcapi.py_universalnewlinefgets
299+
filename=os_helper.TESTFN
300+
self.addCleanup(os_helper.unlink,filename)
301+
302+
withopen(filename,"wb")asfp:
303+
fp.write(b"line1\nline2")
304+
305+
line=py_universalnewlinefgets(filename,1000)
306+
self.assertEqual(line,b"line1\n")
307+
308+
withopen(filename,"wb")asfp:
309+
fp.write(b"line2\r\nline3")
310+
311+
line=py_universalnewlinefgets(filename,1000)
312+
self.assertEqual(line,b"line2\n")
313+
314+
withopen(filename,"wb")asfp:
315+
fp.write(b"line3\rline4")
316+
317+
line=py_universalnewlinefgets(filename,1000)
318+
self.assertEqual(line,b"line3\n")
298319

299320
# PyFile_SetOpenCodeHook() and PyFile_OpenCode() are tested by
300321
# test_embed.test_open_code_hook()

‎Modules/_testcapi/clinic/file.c.h

Lines changed: 35 additions & 1 deletion
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎Modules/_testcapi/file.c

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
#include"parts.h"
55
#include"util.h"
66
#include"clinic/file.c.h"
7+
#include<stdio.h>
8+
#include<Python.h>
79

810

911
/*[clinic input]
@@ -57,9 +59,50 @@ _testcapi_py_fopen_impl(PyObject *module, PyObject *path, const char *mode,
5759
}
5860

5961

62+
/*[clinic input]
63+
_testcapi.py_universalnewlinefgets
64+
65+
file: object
66+
size: int
67+
/
68+
69+
Read a line from a file using Py_UniversalNewlineFgets.
70+
[clinic start generated code]*/
71+
72+
staticPyObject*
73+
_testcapi_py_universalnewlinefgets_impl(PyObject*module,PyObject*file,
74+
intsize)
75+
/*[clinic end generated code: output=2ce1bc76c9dc871c input=02c236049d18569a]*/
76+
{
77+
FILE*fp=Py_fopen(file,"rb");
78+
if (fp==NULL) {
79+
returnNULL;
80+
}
81+
82+
char*buf= (char*)PyMem_Malloc(size);
83+
if (buf==NULL) {
84+
Py_fclose(fp);
85+
returnPyErr_NoMemory();
86+
}
87+
88+
char*result=Py_UniversalNewlineFgets(buf,size,fp,NULL);
89+
if (result==NULL) {
90+
PyMem_Free(buf);
91+
Py_fclose(fp);
92+
Py_RETURN_NONE;
93+
}
94+
95+
PyObject*line=PyBytes_FromString(result);
96+
PyMem_Free(buf);
97+
Py_fclose(fp);
98+
99+
returnline;
100+
}
101+
60102
staticPyMethodDeftest_methods[]= {
61103
_TESTCAPI_PYFILE_NEWSTDPRINTER_METHODDEF
62104
_TESTCAPI_PY_FOPEN_METHODDEF
105+
_TESTCAPI_PY_UNIVERSALNEWLINEFGETS_METHODDEF
63106
{NULL},
64107
};
65108

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp