mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-29 05:05:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-30218: support path-like objects in shutil.unpack_archive() (GH-1367)

Browse source 
Thanks to Jelle Zijlstra for the patch.
This commit is contained in:
Jelle Zijlstra 2017-05-05 14:27:12 -07:00 • committed by Brett Cannon
parent a1054c3b00
commit a12df7b7d4
4 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Lib/test/test_shutil.py
View file

@ -10,6 +10,7 @@ import os
import os.path
import errno
import functools
import pathlib
import subprocess
from shutil import (make_archive,
register_archive_format, unregister_archive_format,
@ -1223,6 +1224,18 @@ class TestShutil(unittest.TestCase):
self.assertNotIn('xxx', formats)
def check_unpack_archive(self, format):
self.check_unpack_archive_with_converter(format, lambda path: path)
self.check_unpack_archive_with_converter(format, pathlib.Path)
class MyPath:
def __init__(self, path):
self.path = path
def __fspath__(self):
return self.path
self.check_unpack_archive_with_converter(format, MyPath)
def check_unpack_archive_with_converter(self, format, converter):
root_dir, base_dir = self._create_files()
expected = rlistdir(root_dir)
expected.remove('outer')
@ -1232,16 +1245,16 @@ class TestShutil(unittest.TestCase):
# let's try to unpack it now
tmpdir2 = self.mkdtemp()
unpack_archive(filename, tmpdir2)
unpack_archive(converter(filename), converter(tmpdir2))
self.assertEqual(rlistdir(tmpdir2), expected)
# and again, this time with the format specified
tmpdir3 = self.mkdtemp()
unpack_archive(filename, tmpdir3, format=format)
unpack_archive(converter(filename), converter(tmpdir3), format=format)
self.assertEqual(rlistdir(tmpdir3), expected)
self.assertRaises(shutil.ReadError, unpack_archive, TESTFN)
self.assertRaises(ValueError, unpack_archive, TESTFN, format='xxx')
self.assertRaises(shutil.ReadError, unpack_archive, converter(TESTFN))
self.assertRaises(ValueError, unpack_archive, converter(TESTFN), format='xxx')
def test_unpack_archive_tar(self):
self.check_unpack_archive('tar')