@@ -3797,8 +3797,6 @@ class Str(str):
3797
3797
else :
3798
3798
encoded = os .fsencode (os_helper .TESTFN )
3799
3799
self .bytes_filenames .append (encoded )
3800
- self .bytes_filenames .append (bytearray (encoded ))
3801
- self .bytes_filenames .append (memoryview (encoded ))
3802
3800
3803
3801
self .filenames = self .bytes_filenames + self .unicode_filenames
3804
3802
@@ -3810,21 +3808,10 @@ def test_oserror_filename(self):
3810
3808
(self .filenames , os .rmdir ,),
3811
3809
(self .filenames , os .stat ,),
3812
3810
(self .filenames , os .unlink ,),
3811
+ (self .filenames , os .listdir ,),
3812
+ (self .filenames , os .rename , "dst" ),
3813
+ (self .filenames , os .replace , "dst" ),
3813
3814
]
3814
- if sys .platform == "win32" :
3815
- funcs .extend ((
3816
- (self .bytes_filenames , os .rename , b"dst" ),
3817
- (self .bytes_filenames , os .replace , b"dst" ),
3818
- (self .unicode_filenames , os .rename , "dst" ),
3819
- (self .unicode_filenames , os .replace , "dst" ),
3820
- (self .unicode_filenames , os .listdir , ),
3821
- ))
3822
- else :
3823
- funcs .extend ((
3824
- (self .filenames , os .listdir ,),
3825
- (self .filenames , os .rename , "dst" ),
3826
- (self .filenames , os .replace , "dst" ),
3827
- ))
3828
3815
if os_helper .can_chmod ():
3829
3816
funcs .append ((self .filenames , os .chmod , 0o777 ))
3830
3817
if hasattr (os , "chown" ):
@@ -3840,11 +3827,7 @@ def test_oserror_filename(self):
3840
3827
if hasattr (os , "chroot" ):
3841
3828
funcs .append ((self .filenames , os .chroot ,))
3842
3829
if hasattr (os , "link" ):
3843
- if sys .platform == "win32" :
3844
- funcs .append ((self .bytes_filenames , os .link , b"dst" ))
3845
- funcs .append ((self .unicode_filenames , os .link , "dst" ))
3846
- else :
3847
- funcs .append ((self .filenames , os .link , "dst" ))
3830
+ funcs .append ((self .filenames , os .link , "dst" ))
3848
3831
if hasattr (os , "listxattr" ):
3849
3832
funcs .extend ((
3850
3833
(self .filenames , os .listxattr ,),
@@ -3857,21 +3840,16 @@ def test_oserror_filename(self):
3857
3840
if hasattr (os , "readlink" ):
3858
3841
funcs .append ((self .filenames , os .readlink ,))
3859
3842
3860
-
3861
3843
for filenames , func , * func_args in funcs :
3862
3844
for name in filenames :
3863
- if not isinstance (name , (str , bytes )):
3864
- with self .assertRaises (TypeError ):
3865
- func (name , * func_args )
3845
+ try :
3846
+ func (name , * func_args )
3847
+ except OSError as err :
3848
+ self .assertIs (err .filename , name , str (func ))
3849
+ except UnicodeDecodeError :
3850
+ pass
3866
3851
else :
3867
- try :
3868
- func (name , * func_args )
3869
- except OSError as err :
3870
- self .assertIs (err .filename , name , str (func ))
3871
- except UnicodeDecodeError :
3872
- pass
3873
- else :
3874
- self .fail ("No exception thrown by {}" .format (func ))
3852
+ self .fail (f"No exception thrown by { func } " )
3875
3853
3876
3854
class CPUCountTests (unittest .TestCase ):
3877
3855
def test_cpu_count (self ):
@@ -4351,7 +4329,7 @@ def test_bytes_like(self):
4351
4329
for cls in bytearray , memoryview :
4352
4330
path_bytes = cls (os .fsencode (self .path ))
4353
4331
with self .assertRaises (TypeError ):
4354
- list ( os .scandir (path_bytes ) )
4332
+ os .scandir (path_bytes )
4355
4333
4356
4334
@unittest .skipUnless (os .listdir in os .supports_fd ,
4357
4335
'fd support for listdir required for this test.' )
0 commit comments