mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #17401: Output the closefd attribute as boolean.

Browse source
This commit is contained in:
Serhiy Storchaka 2014-12-02 23:39:56 +02:00
parent b16edc8087
commit 4954f9fcab
2 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Lib/test/test_fileio.py
View file

@ -113,15 +113,25 @@ class AutoFileTests(unittest.TestCase):
def testRepr(self): def testRepr(self):
self.assertEqual( self.assertEqual(
repr(self.f), "<_io.FileIO name=%r mode=%r closefd='%d'>" repr(self.f), "<_io.FileIO name=%r mode=%r closefd=True>"
% (self.f.name, self.f.mode, self.f.closefd)) % (self.f.name, self.f.mode))
del self.f.name del self.f.name
self.assertEqual( self.assertEqual(
repr(self.f), "<_io.FileIO fd=%r mode=%r closefd='%d'>" repr(self.f), "<_io.FileIO fd=%r mode=%r closefd=True>"
% (self.f.fileno(), self.f.mode, self.f.closefd)) % (self.f.fileno(), self.f.mode))
self.f.close() self.f.close()
self.assertEqual(repr(self.f), "<_io.FileIO [closed]>") self.assertEqual(repr(self.f), "<_io.FileIO [closed]>")
def testReprNoCloseFD(self):
fd = os.open(TESTFN, os.O_RDONLY)
try:
with _FileIO(fd, 'r', closefd=False) as f:
self.assertEqual(repr(f),
"<_io.FileIO name=%r mode=%r closefd=False>"
% (f.name, f.mode))
finally:
os.close(fd)
def testErrors(self): def testErrors(self):
f = self.f f = self.f
self.assertTrue(not f.isatty()) self.assertTrue(not f.isatty())

8
Modules/_io/fileio.c
View file

@ -1055,13 +1055,13 @@ fileio_repr(fileio *self)
else else
return NULL; return NULL;
res = PyUnicode_FromFormat( res = PyUnicode_FromFormat(
"<_io.FileIO fd=%d mode='%s' closefd='%d'>", "<_io.FileIO fd=%d mode='%s' closefd=%s>",
self->fd, mode_string(self), self->closefd); self->fd, mode_string(self), self->closefd ? "True" : "False");
} }
else { else {
res = PyUnicode_FromFormat( res = PyUnicode_FromFormat(
"<_io.FileIO name=%R mode='%s' closefd='%d'>", "<_io.FileIO name=%R mode='%s' closefd=%s>",
nameobj, mode_string(self), self->closefd); nameobj, mode_string(self), self->closefd ? "True" : "False");
Py_DECREF(nameobj); Py_DECREF(nameobj);
} }
return res; return res;