From: Zachary Ware <zachary.ware@gmail.com>
Date: Mon, 30 Dec 2013 20:39:46 +0000 (-0600)
Subject: Issue #19544, #6516: check ZLIB_SUPPORT, not zlib (which might not be bound)
X-Git-Tag: v3.4.0b2~68
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ee2c955954167318173ea3a60c1a03f4a0d21c6;p=thirdparty%2FPython%2Fcpython.git

Issue #19544, #6516: check ZLIB_SUPPORT, not zlib (which might not be bound)
---

diff --git a/Lib/distutils/tests/test_archive_util.py b/Lib/distutils/tests/test_archive_util.py
index 6b42c5a213a5..2d72af4aa6f4 100644
--- a/Lib/distutils/tests/test_archive_util.py
+++ b/Lib/distutils/tests/test_archive_util.py
@@ -308,7 +308,7 @@ class ArchiveUtilTestCase(support.TempdirManager,
                            owner='kjhkjhkjg', group='oihohoh')
         self.assertTrue(os.path.exists(res))
 
-    @unittest.skipUnless(zlib, "Requires zlib")
+    @unittest.skipUnless(ZLIB_SUPPORT, "Requires zlib")
     @unittest.skipUnless(UID_GID_SUPPORT, "Requires grp and pwd support")
     def test_tarfile_root_owner(self):
         tmpdir, tmpdir2, base_name =  self._create_files()