1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gh-71253: Match _io exception in _pyio (gh-133985)

Browse Source 
Test was only testing _io, expanded to cover _pyio.

Co-authored-by: Peter Bierma <zintensitydev@gmail.com>
This commit is contained in:
Cody Maloney 2025-05-21 10:45:00 -04:00 committed by GitHub
parent 84d5f8d799
commit 06eaf4055c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/_pyio.py
View File

@ -1563,7 +1563,8 @@ class FileIO(RawIOBase):
if not isinstance(fd, int): if not isinstance(fd, int):
raise TypeError('expected integer from opener') raise TypeError('expected integer from opener')
if fd < 0: if fd < 0:
raise OSError('Negative file descriptor') # bpo-27066: Raise a ValueError for bad value.
raise ValueError(f'opener returned {fd}')
owned_fd = fd owned_fd = fd
if not noinherit_flag: if not noinherit_flag:
os.set_inheritable(fd, False) os.set_inheritable(fd, False)

4
Lib/test/test_io.py
View File

@ -918,7 +918,7 @@ class IOTest(unittest.TestCase):
def badopener(fname, flags): def badopener(fname, flags):
return -1 return -1
with self.assertRaises(ValueError) as cm: with self.assertRaises(ValueError) as cm:
open('non-existent', 'r', opener=badopener) self.open('non-existent', 'r', opener=badopener)
self.assertEqual(str(cm.exception), 'opener returned -1') self.assertEqual(str(cm.exception), 'opener returned -1')
def test_bad_opener_other_negative(self): def test_bad_opener_other_negative(self):
@ -926,7 +926,7 @@ class IOTest(unittest.TestCase):
def badopener(fname, flags): def badopener(fname, flags):
return -2 return -2
with self.assertRaises(ValueError) as cm: with self.assertRaises(ValueError) as cm:
open('non-existent', 'r', opener=badopener) self.open('non-existent', 'r', opener=badopener)
self.assertEqual(str(cm.exception), 'opener returned -2') self.assertEqual(str(cm.exception), 'opener returned -2')
def test_opener_invalid_fd(self): def test_opener_invalid_fd(self):

3
Misc/NEWS.d/next/Library/2025-05-13-18-21-59.gh-issue-71253.-3Sf_K.rst Normal file
View File

@ -0,0 +1,3 @@
Raise :exc:`ValueError` in :func:`open` if *opener* returns a negative
file-descriptor in the Python implementation of :mod:`io` to match the
C implementation.