summaryrefslogtreecommitdiffstats
path: root/Lib/shutil.py
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2010-04-21 13:32:26 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2010-04-21 13:32:26 (GMT)
commit62e17ad2340f2c46aed45cf38ead786f5d5124d2 (patch)
treecbbed18851e3314741597b32f15faa8c5e6dcc98 /Lib/shutil.py
parentf0a4cceba6d6f13cc73b23be4de4362617cfb1c0 (diff)
downloadcpython-62e17ad2340f2c46aed45cf38ead786f5d5124d2.zip
cpython-62e17ad2340f2c46aed45cf38ead786f5d5124d2.tar.gz
cpython-62e17ad2340f2c46aed45cf38ead786f5d5124d2.tar.bz2
shutil: removed unused import and fixed attributes names in _call_external_zip
Diffstat (limited to 'Lib/shutil.py')
-rw-r--r--Lib/shutil.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py
index 2a2be9e..703b3b5 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
@@ -393,7 +392,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"
@@ -437,7 +436,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",