[Python-checkins] r80309 - in python/branches/py3k: Lib/shutil.py

[tarek.ziade]

Author: tarek.ziade
Date: Wed Apr 21 15:35:21 2010
New Revision: 80309

Log:
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
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/shutil.py

Modified: python/branches/py3k/Lib/shutil.py
==============================================================================
--- python/branches/py3k/Lib/shutil.py	(original)
+++ python/branches/py3k/Lib/shutil.py	Wed Apr 21 15:35:21 2010
@@ -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",