Commit7fc51c3

authored

gh-114257: Ignore the FileNotFound error in ctypes.util._is_elf() (GH-114394)

1 parented30a3c commit7fc51c3Copy full SHA for 7fc51c3

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,11 @@ def find_library(name):`
`96`	`96`	`def_is_elf(filename):`
`97`	`97`	`"Return True if the given file is an ELF file"`
`98`	`98`	`elf_header=b'\x7fELF'`
`99`		`-withopen(filename,'br')asthefile:`
`100`		`-returnthefile.read(4)==elf_header`
	`99`	`+try:`
	`100`	`+withopen(filename,'br')asthefile:`
	`101`	`+returnthefile.read(4)==elf_header`
	`102`	`+exceptFileNotFoundError:`
	`103`	`+returnFalse`
`101`	`104`
`102`	`105`	`def_findLib_gcc(name):`
`103`	`106`	`# Run GCC's linker with the -t (aka --trace) option and examine the`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,9 @@ def test_find_library_with_ld(self):`
`125`	`125`	`unittest.mock.patch("ctypes.util._findLib_gcc",lambda*args:None):`
`126`	`126`	`self.assertNotEqual(find_library('c'),None)`
`127`	`127`
	`128`	`+deftest_gh114257(self):`
	`129`	`+self.assertIsNone(find_library("libc"))`
	`130`	`+`
`128`	`131`
`129`	`132`	`if__name__=="__main__":`
`130`	`133`	`unittest.main()`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Dismiss the:exc:`FileNotFound` error in:func:`ctypes.util.find_library` and
	`2`	+just return ``None`` on Linux.

Comments

(0)