Commit874a4f7

authored

gh-118507 : Refactor ntpath native functions (gh-119381)

This refactoring will make future backports easier without changing behaviours,apart from correcting a bug when passing a pipe to `ntpath.isfile`.

1 parent8c96850 commit874a4f7Copy full SHA for 874a4f7

File tree

+335

-379

lines changed

+335

-379

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,10 @@ def test_exists(self):`
`135`	`135`	`self.assertIs(self.pathmodule.exists(filename),False)`
`136`	`136`	`self.assertIs(self.pathmodule.exists(bfilename),False)`
`137`	`137`
	`138`	`+ifself.pathmoduleisnotgenericpath:`
	`139`	`+self.assertIs(self.pathmodule.lexists(filename),False)`
	`140`	`+self.assertIs(self.pathmodule.lexists(bfilename),False)`
	`141`	`+`
`138`	`142`	`create_file(filename)`
`139`	`143`
`140`	`144`	`self.assertIs(self.pathmodule.exists(filename),True)`

Lines changed: 21 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -976,6 +976,27 @@ def test_isfile_driveletter(self):`
`976`	`976`	`raiseunittest.SkipTest('SystemDrive is not defined or malformed')`
`977`	`977`	`self.assertFalse(os.path.isfile('\\\\.\\'+drive))`
`978`	`978`
	`979`	`+@unittest.skipUnless(hasattr(os,'pipe'),"need os.pipe()")`
	`980`	`+deftest_isfile_anonymous_pipe(self):`
	`981`	`+pr,pw=os.pipe()`
	`982`	`+try:`
	`983`	`+self.assertFalse(ntpath.isfile(pr))`
	`984`	`+finally:`
	`985`	`+os.close(pr)`
	`986`	`+os.close(pw)`
	`987`	`+`
	`988`	`+@unittest.skipIf(sys.platform!='win32',"windows only")`
	`989`	`+deftest_isfile_named_pipe(self):`
	`990`	`+import_winapi`
	`991`	`+named_pipe=f'//./PIPE/python_isfile_test_{os.getpid()}'`
	`992`	`+h=_winapi.CreateNamedPipe(named_pipe,`
	`993`	`+_winapi.PIPE_ACCESS_INBOUND,`
	`994`	`+0,1,0,0,0,0)`
	`995`	`+try:`
	`996`	`+self.assertFalse(ntpath.isfile(named_pipe))`
	`997`	`+finally:`
	`998`	`+_winapi.CloseHandle(h)`
	`999`	`+`
`979`	`1000`	`@unittest.skipIf(sys.platform!='win32',"windows only")`
`980`	`1001`	`deftest_con_device(self):`
`981`	`1002`	`self.assertFalse(os.path.isfile(r"\\.\CON"))`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix:func:`os.path.isfile` on Windows for pipes.

Lines changed: 56 additions & 68 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Comments

(0)