mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 80306 via svnmerge from

Browse source 
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
........
This commit is contained in:
Tarek Ziadé 2010-04-21 13:35:21 +00:00
parent df6198ee39
commit e212416420
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/shutil.py
View file

@ -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",