From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 16 Dec 2016 17:00:55 +0000 (+0200)
Subject: Issue #14061: Misc fixes and cleanups in archiving code in shutil.
X-Git-Tag: v3.6.1rc1~299
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9bb6fe52742340f6c92f0dda18599a4577a94e18;p=python

Issue #14061: Misc fixes and cleanups in archiving code in shutil.

Imporoved the documentation and tests for make_archive() and unpack_archive().
Improved error handling when corresponding compress module is not available.
Brake circular dependency between shutil and tarfile modules.
---

9bb6fe52742340f6c92f0dda18599a4577a94e18
diff --cc Lib/test/test_shutil.py
index 46e2c57746,709feebf01..2ad3a21c86
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@@ -22,20 -23,7 +23,8 @@@ import zipfil
  import warnings
  
  from test import support
 -from test.support import TESTFN, check_warnings, captured_stdout
 +from test.support import (TESTFN, check_warnings, captured_stdout,
-                           requires_zlib, android_not_root)
- 
- try:
-     import bz2
-     BZ2_SUPPORTED = True
- except ImportError:
-     BZ2_SUPPORTED = False
- 
- try:
-     import lzma
-     LZMA_SUPPORTED = True
- except ImportError:
-     LZMA_SUPPORTED = False
++                          android_not_root)
  
  TESTFN2 = TESTFN + "2"