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
........
diff --git a/Lib/shutil.py b/Lib/shutil.py
index cf7fe1c..465f841 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -9,7 +9,6 @@
import stat
from os.path import abspath
import fnmatch
-from warnings import warn
import collections
import errno
@@ -410,7 +409,7 @@
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 @@
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",