@@ -125,18 +125,19 @@ def test_splitdrive(self):
125125 ("//?/UNC/server/share" , "/dir" ))
126126
127127 def test_splitdrive_invalid_paths (self ):
128- self .assertEqual (ntpath .splitdrive ('\\ \\ ser\x00 ver\\ sha\x00 re\\ di\x00 r' ),
128+ splitdrive = ntpath .splitdrive
129+ self .assertEqual (splitdrive ('\\ \\ ser\x00 ver\\ sha\x00 re\\ di\x00 r' ),
129130 ('\\ \\ ser\x00 ver\\ sha\x00 re' , '\\ di\x00 r' ))
130- self .assertEqual (ntpath . splitdrive (b'\\ \\ ser\x00 ver\\ sha\x00 re\\ di\x00 r' ),
131+ self .assertEqual (splitdrive (b'\\ \\ ser\x00 ver\\ sha\x00 re\\ di\x00 r' ),
131132 (b'\\ \\ ser\x00 ver\\ sha\x00 re' , b'\\ di\x00 r' ))
132- self .assertEqual (ntpath . splitdrive ("\\ \\ \udfff \\ \udffe \\ \udffd " ),
133+ self .assertEqual (splitdrive ("\\ \\ \udfff \\ \udffe \\ \udffd " ),
133134 ('\\ \\ \udfff \\ \udffe ' , '\\ \udffd ' ))
134135 if sys .platform == 'win32' :
135- self .assertRaises (UnicodeDecodeError , ntpath . splitdrive , b'\\ \\ \xff \\ share\\ dir' )
136- self .assertRaises (UnicodeDecodeError , ntpath . splitdrive , b'\\ \\ server\\ \xff \\ dir' )
137- self .assertRaises (UnicodeDecodeError , ntpath . splitdrive , b'\\ \\ server\\ share\\ \xff ' )
136+ self .assertRaises (UnicodeDecodeError , splitdrive , b'\\ \\ \xff \\ share\\ dir' )
137+ self .assertRaises (UnicodeDecodeError , splitdrive , b'\\ \\ server\\ \xff \\ dir' )
138+ self .assertRaises (UnicodeDecodeError , splitdrive , b'\\ \\ server\\ share\\ \xff ' )
138139 else :
139- self .assertEqual (ntpath . splitdrive (b'\\ \\ \xff \\ \xfe \\ \xfd ' ),
140+ self .assertEqual (splitdrive (b'\\ \\ \xff \\ \xfe \\ \xfd ' ),
140141 (b'\\ \\ \xff \\ \xfe ' , b'\\ \xfd ' ))
141142
142143 def test_splitroot (self ):
@@ -230,18 +231,19 @@ def test_splitroot(self):
230231 tester ('ntpath.splitroot("/:/foo")' , ("" , "/" , ":/foo" ))
231232
232233 def test_splitroot_invalid_paths (self ):
233- self .assertEqual (ntpath .splitroot ('\\ \\ ser\x00 ver\\ sha\x00 re\\ di\x00 r' ),
234+ splitroot = ntpath .splitroot
235+ self .assertEqual (splitroot ('\\ \\ ser\x00 ver\\ sha\x00 re\\ di\x00 r' ),
234236 ('\\ \\ ser\x00 ver\\ sha\x00 re' , '\\ ' , 'di\x00 r' ))
235- self .assertEqual (ntpath . splitroot (b'\\ \\ ser\x00 ver\\ sha\x00 re\\ di\x00 r' ),
237+ self .assertEqual (splitroot (b'\\ \\ ser\x00 ver\\ sha\x00 re\\ di\x00 r' ),
236238 (b'\\ \\ ser\x00 ver\\ sha\x00 re' , b'\\ ' , b'di\x00 r' ))
237- self .assertEqual (ntpath . splitroot ("\\ \\ \udfff \\ \udffe \\ \udffd " ),
239+ self .assertEqual (splitroot ("\\ \\ \udfff \\ \udffe \\ \udffd " ),
238240 ('\\ \\ \udfff \\ \udffe ' , '\\ ' , '\udffd ' ))
239241 if sys .platform == 'win32' :
240- self .assertRaises (UnicodeDecodeError , ntpath . splitroot , b'\\ \\ \xff \\ share\\ dir' )
241- self .assertRaises (UnicodeDecodeError , ntpath . splitroot , b'\\ \\ server\\ \xff \\ dir' )
242- self .assertRaises (UnicodeDecodeError , ntpath . splitroot , b'\\ \\ server\\ share\\ \xff ' )
242+ self .assertRaises (UnicodeDecodeError , splitroot , b'\\ \\ \xff \\ share\\ dir' )
243+ self .assertRaises (UnicodeDecodeError , splitroot , b'\\ \\ server\\ \xff \\ dir' )
244+ self .assertRaises (UnicodeDecodeError , splitroot , b'\\ \\ server\\ share\\ \xff ' )
243245 else :
244- self .assertEqual (ntpath . splitroot (b'\\ \\ \xff \\ \xfe \\ \xfd ' ),
246+ self .assertEqual (splitroot (b'\\ \\ \xff \\ \xfe \\ \xfd ' ),
245247 (b'\\ \\ \xff \\ \xfe ' , b'\\ ' , b'\xfd ' ))
246248
247249 def test_split (self ):
@@ -257,17 +259,18 @@ def test_split(self):
257259 tester ('ntpath.split("//conky/mountpoint/")' , ('//conky/mountpoint/' , '' ))
258260
259261 def test_split_invalid_paths (self ):
260- self .assertEqual (ntpath .split ('c:\\ fo\x00 o\\ ba\x00 r' ),
262+ split = ntpath .split
263+ self .assertEqual (split ('c:\\ fo\x00 o\\ ba\x00 r' ),
261264 ('c:\\ fo\x00 o' , 'ba\x00 r' ))
262- self .assertEqual (ntpath . split (b'c:\\ fo\x00 o\\ ba\x00 r' ),
265+ self .assertEqual (split (b'c:\\ fo\x00 o\\ ba\x00 r' ),
263266 (b'c:\\ fo\x00 o' , b'ba\x00 r' ))
264- self .assertEqual (ntpath . split ('c:\\ \udfff \\ \udffe ' ),
267+ self .assertEqual (split ('c:\\ \udfff \\ \udffe ' ),
265268 ('c:\\ \udfff ' , '\udffe ' ))
266269 if sys .platform == 'win32' :
267- self .assertRaises (UnicodeDecodeError , ntpath . split , b'c:\\ \xff \\ bar' )
268- self .assertRaises (UnicodeDecodeError , ntpath . split , b'c:\\ foo\\ \xff ' )
270+ self .assertRaises (UnicodeDecodeError , split , b'c:\\ \xff \\ bar' )
271+ self .assertRaises (UnicodeDecodeError , split , b'c:\\ foo\\ \xff ' )
269272 else :
270- self .assertEqual (ntpath . split (b'c:\\ \xff \\ \xfe ' ),
273+ self .assertEqual (split (b'c:\\ \xff \\ \xfe ' ),
271274 (b'c:\\ \xff ' , b'\xfe ' ))
272275
273276 def test_isabs (self ):
@@ -393,12 +396,13 @@ def test_normcase(self):
393396 expected .encode ())
394397
395398 def test_normcase_invalid_paths (self ):
396- self .assertEqual (ntpath .normcase ('abc\x00 def' ), 'abc\x00 def' )
397- self .assertEqual (ntpath .normcase (b'abc\x00 def' ), b'abc\x00 def' )
398- self .assertEqual (ntpath .normcase ('\udfff ' ), '\udfff ' )
399+ normcase = ntpath .normcase
400+ self .assertEqual (normcase ('abc\x00 def' ), 'abc\x00 def' )
401+ self .assertEqual (normcase (b'abc\x00 def' ), b'abc\x00 def' )
402+ self .assertEqual (normcase ('\udfff ' ), '\udfff ' )
399403 if sys .platform == 'win32' :
400404 path = b'ABC' + bytes (range (128 , 256 ))
401- self .assertEqual (ntpath . normcase (path ), path .lower ())
405+ self .assertEqual (normcase (path ), path .lower ())
402406
403407 def test_normpath (self ):
404408 tester ("ntpath.normpath('A//////././//.//B')" , r'A\B' )
@@ -1126,15 +1130,16 @@ def test_ismount(self):
11261130 self .assertTrue (ntpath .ismount (b"\\ \\ localhost\\ c$\\ " ))
11271131
11281132 def test_ismount_invalid_paths (self ):
1129- self .assertFalse (ntpath .ismount ("c:\\ \udfff " ))
1133+ ismount = ntpath .ismount
1134+ self .assertFalse (ismount ("c:\\ \udfff " ))
11301135 if sys .platform == 'win32' :
1131- self .assertRaises (ValueError , ntpath . ismount , "c:\\ \x00 " )
1132- self .assertRaises (ValueError , ntpath . ismount , b"c:\\ \x00 " )
1133- self .assertRaises (UnicodeDecodeError , ntpath . ismount , b"c:\\ \xff " )
1136+ self .assertRaises (ValueError , ismount , "c:\\ \x00 " )
1137+ self .assertRaises (ValueError , ismount , b"c:\\ \x00 " )
1138+ self .assertRaises (UnicodeDecodeError , ismount , b"c:\\ \xff " )
11341139 else :
1135- self .assertFalse (ntpath . ismount ("c:\\ \x00 " ))
1136- self .assertFalse (ntpath . ismount (b"c:\\ \x00 " ))
1137- self .assertFalse (ntpath . ismount (b"c:\\ \xff " ))
1140+ self .assertFalse (ismount ("c:\\ \x00 " ))
1141+ self .assertFalse (ismount (b"c:\\ \x00 " ))
1142+ self .assertFalse (ismount (b"c:\\ \xff " ))
11381143
11391144 def test_isreserved (self ):
11401145 self .assertFalse (ntpath .isreserved ('' ))
@@ -1243,10 +1248,11 @@ def test_isjunction(self):
12431248 self .assertPathEqual (ntpath .realpath ('testjunc' ), ntpath .realpath ('tmpdir' ))
12441249
12451250 def test_isfile_invalid_paths (self ):
1246- self .assertIs (ntpath .isfile ('/tmp\udfff abcds' ), False )
1247- self .assertIs (ntpath .isfile (b'/tmp\xff abcds' ), False )
1248- self .assertIs (ntpath .isfile ('/tmp\x00 abcds' ), False )
1249- self .assertIs (ntpath .isfile (b'/tmp\x00 abcds' ), False )
1251+ isfile = ntpath .isfile
1252+ self .assertIs (isfile ('/tmp\udfff abcds' ), False )
1253+ self .assertIs (isfile (b'/tmp\xff abcds' ), False )
1254+ self .assertIs (isfile ('/tmp\x00 abcds' ), False )
1255+ self .assertIs (isfile (b'/tmp\x00 abcds' ), False )
12501256
12511257 @unittest .skipIf (sys .platform != 'win32' , "drive letters are a windows concept" )
12521258 def test_isfile_driveletter (self ):
0 commit comments