From e212416420e446d21dc8b8ecd4e26e5df896d5a3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tarek=20Ziad=C3=A9?= Date: Wed, 21 Apr 2010 13:35:21 +0000 Subject: [PATCH] Merged revisions 80306 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80306 | tarek.ziade | 2010-04-21 15:32:26 +0200 (Wed, 21 Apr 2010) | 1 line shutil: removed unused import and fixed attributes names in _call_external_zip ........ --- Lib/shutil.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Lib/shutil.py b/Lib/shutil.py index cf7fe1c559..465f841507 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -9,7 +9,6 @@ import sys import stat from os.path import abspath import fnmatch -from warnings import warn import collections import errno @@ -410,7 +409,7 @@ def _make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0, return archive_name -def _call_external_zip(directory, verbose=False): +def _call_external_zip(base_dir, zip_filename, verbose=False, dry_run=False): # XXX see if we want to keep an external call here if verbose: zipoptions = "-r" @@ -453,7 +452,7 @@ def _make_zipfile(base_name, base_dir, verbose=0, dry_run=0, logger=None): zipfile = None if zipfile is None: - _call_external_zip(base_dir, verbose) + _call_external_zip(base_dir, zip_filename, verbose, dry_run) else: if logger is not None: logger.info("creating '%s' and adding '%s' to it", -- 2.40.0