[Python-checkins] r80306 - python/trunk/Lib/shutil.py

[tarek.ziade]

Author: tarek.ziade
Date: Wed Apr 21 15:32:26 2010
New Revision: 80306

Log:
shutil: removed unused import and fixed attributes names in _call_external_zip

Modified:
   python/trunk/Lib/shutil.py

Modified: python/trunk/Lib/shutil.py
==============================================================================
--- python/trunk/Lib/shutil.py	(original)
+++ python/trunk/Lib/shutil.py	Wed Apr 21 15:32:26 2010
@@ -9,7 +9,6 @@
 import stat
 from os.path import abspath
 import fnmatch
-from warnings import warn
 import collections
 import errno
 
@@ -393,7 +392,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"
@@ -437,7 +436,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",