Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 87277 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87277 | eric.araujo | 2010-12-15 21:26:30 +0100 (mer., 15 déc. 2010) | 2 lines

  Fix wrong name in docstring and doc (#10693).  Original patch by Eli Benderski.
........
This commit is contained in:
Éric Araujo 2010-12-15 20:33:50 +00:00
parent 64a1e7cab1
commit 6e52cf32ad
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/distutils/apiref.rst
View File

@ -888,7 +888,7 @@ tarballs or zipfiles.
.. function:: make_zipfile(base_name, base_dir[, verbose=0, dry_run=0]) .. function:: make_zipfile(base_name, base_dir[, verbose=0, dry_run=0])
Create a zip file from all files in and under *base_dir*. The output zip file Create a zip file from all files in and under *base_dir*. The output zip file
will be named *base_dir* + :file:`.zip`. Uses either the :mod:`zipfile` Python will be named *base_name* + :file:`.zip`. Uses either the :mod:`zipfile` Python
module (if available) or the InfoZIP :file:`zip` utility (if installed and module (if available) or the InfoZIP :file:`zip` utility (if installed and
found on the default search path). If neither tool is available, raises found on the default search path). If neither tool is available, raises
:exc:`DistutilsExecError`. Returns the name of the output zip file. :exc:`DistutilsExecError`. Returns the name of the output zip file.

2
Lib/distutils/archive_util.py
View File

@ -121,7 +121,7 @@ def make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0,
def make_zipfile(base_name, base_dir, verbose=0, dry_run=0): def make_zipfile(base_name, base_dir, verbose=0, dry_run=0):
"""Create a zip file from all the files under 'base_dir'. """Create a zip file from all the files under 'base_dir'.
The output zip file will be named 'base_dir' + ".zip". Uses either the The output zip file will be named 'base_name' + ".zip". Uses either the
"zipfile" Python module (if available) or the InfoZIP "zip" utility "zipfile" Python module (if available) or the InfoZIP "zip" utility
(if installed and found on the default search path). If neither tool is (if installed and found on the default search path). If neither tool is
available, raises DistutilsExecError. Returns the name of the output zip available, raises DistutilsExecError. Returns the name of the output zip

4
Lib/shutil.py
View File

@ -336,7 +336,7 @@ def _make_tarball(base_name, base_dir, compress="gzip", verbose=0, dry_run=0,
archive that is being built. If not provided, the current owner and group archive that is being built. If not provided, the current owner and group
will be used. will be used.
The output tar file will be named 'base_dir' + ".tar", possibly plus The output tar file will be named 'base_name' + ".tar", possibly plus
the appropriate compression extension (".gz", or ".bz2"). the appropriate compression extension (".gz", or ".bz2").
Returns the output filename. Returns the output filename.
@ -406,7 +406,7 @@ def _call_external_zip(base_dir, zip_filename, verbose=False, dry_run=False):
def _make_zipfile(base_name, base_dir, verbose=0, dry_run=0, logger=None): def _make_zipfile(base_name, base_dir, verbose=0, dry_run=0, logger=None):
"""Create a zip file from all the files under 'base_dir'. """Create a zip file from all the files under 'base_dir'.
The output zip file will be named 'base_dir' + ".zip". Uses either the The output zip file will be named 'base_name' + ".zip". Uses either the
"zipfile" Python module (if available) or the InfoZIP "zip" utility "zipfile" Python module (if available) or the InfoZIP "zip" utility
(if installed and found on the default search path). If neither tool is (if installed and found on the default search path). If neither tool is
available, raises ExecError. Returns the name of the output zip available, raises ExecError. Returns the name of the output zip