mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 03:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 87277 via svnmerge from

Browse source 
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 Bendersky.
........
This commit is contained in:
Éric Araujo 2010-12-15 20:30:51 +00:00
parent 800dfee91a
commit 7e2e321da3
2 changed files with 2 additions and 2 deletions
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

@ -68,7 +68,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