Issue #14061: Misc fixes and cleanups in archiving code in shutil.
Improved the documentation and tests for make_archive().
Improved error handling when corresponding compress module is not available.
External zip executable is now used if the zlib module is not available.
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
index 0869a9e..8338712 100644
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -35,6 +35,7 @@
try:
import zipfile
+ import zlib
ZIP_SUPPORT = True
except ImportError:
ZIP_SUPPORT = find_executable('zip')
@@ -460,7 +461,6 @@
self.assertEqual(tarball, base_name + '.tar')
self.assertTrue(os.path.isfile(tarball))
- @unittest.skipUnless(zlib, "Requires zlib")
@unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
def test_make_zipfile(self):
# creating something to zip
@@ -485,6 +485,7 @@
['dist/', 'dist/file1', 'dist/file2',
'dist/sub/', 'dist/sub/file3', 'dist/sub2/',
'outer'])
+ support.unlink(res)
with support.change_cwd(work_dir):
base_name = os.path.abspath(rel_base_name)
@@ -498,7 +499,6 @@
['dist/', 'dist/file1', 'dist/file2',
'dist/sub/', 'dist/sub/file3', 'dist/sub2/'])
- @unittest.skipUnless(zlib, "Requires zlib")
@unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
@unittest.skipUnless(find_executable('zip'),
'Need the zip command to run')
@@ -524,7 +524,6 @@
names2 = zf.namelist()
self.assertEqual(sorted(names), sorted(names2))
- @unittest.skipUnless(zlib, "Requires zlib")
@unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run')
@unittest.skipUnless(find_executable('unzip'),
'Need the unzip command to run')