Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #26027: Don't test for bytearray in path_t as that's now 

deprecated.
This commit is contained in:
Brett Cannon 2016-08-26 19:30:11 -07:00
parent 68ed978f56
commit 8f96a30630
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/test/test_os.py
View File

@ -2842,7 +2842,6 @@ class PathTConverterTests(unittest.TestCase):
str_filename = support.TESTFN str_filename = support.TESTFN
bytes_filename = support.TESTFN.encode('ascii') bytes_filename = support.TESTFN.encode('ascii')
bytearray_filename = bytearray(bytes_filename)
fd = os.open(PathLike(str_filename), os.O_WRONLY|os.O_CREAT) fd = os.open(PathLike(str_filename), os.O_WRONLY|os.O_CREAT)
self.addCleanup(os.close, fd) self.addCleanup(os.close, fd)
self.addCleanup(support.unlink, support.TESTFN) self.addCleanup(support.unlink, support.TESTFN)
@ -2850,7 +2849,6 @@ class PathTConverterTests(unittest.TestCase):
int_fspath = PathLike(fd) int_fspath = PathLike(fd)
str_fspath = PathLike(str_filename) str_fspath = PathLike(str_filename)
bytes_fspath = PathLike(bytes_filename) bytes_fspath = PathLike(bytes_filename)
bytearray_fspath = PathLike(bytearray_filename)
for name, allow_fd, extra_args, cleanup_fn in self.functions: for name, allow_fd, extra_args, cleanup_fn in self.functions:
with self.subTest(name=name): with self.subTest(name=name):
@ -2859,8 +2857,8 @@ class PathTConverterTests(unittest.TestCase):
except AttributeError: except AttributeError:
continue continue
for path in (str_filename, bytes_filename, bytearray_filename, for path in (str_filename, bytes_filename, str_fspath,
str_fspath, bytes_fspath): bytes_fspath):
with self.subTest(name=name, path=path): with self.subTest(name=name, path=path):
result = fn(path, *extra_args) result = fn(path, *extra_args)
if cleanup_fn is not None: if cleanup_fn is not None:
@ -2869,9 +2867,6 @@ class PathTConverterTests(unittest.TestCase):
with self.assertRaisesRegex( with self.assertRaisesRegex(
TypeError, 'should be string, bytes'): TypeError, 'should be string, bytes'):
fn(int_fspath, *extra_args) fn(int_fspath, *extra_args)
with self.assertRaisesRegex(
TypeError, 'should be string, bytes'):
fn(bytearray_fspath, *extra_args)
if allow_fd: if allow_fd:
result = fn(fd, *extra_args) # should not fail result = fn(fd, *extra_args) # should not fail