From: Éric Araujo Date: Wed, 15 Dec 2010 20:30:51 +0000 (+0000) Subject: Merged revisions 87277 via svnmerge from X-Git-Tag: v3.2.1b1~347^2~168 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e2e321da310dd2a450ad3422b9567e0e2d04182;p=python 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 Bendersky. ........ --- diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst index f76f72b8f2..81de1ad1ea 100644 --- a/Doc/distutils/apiref.rst +++ b/Doc/distutils/apiref.rst @@ -888,7 +888,7 @@ tarballs or zipfiles. .. 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 - 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 found on the default search path). If neither tool is available, raises :exc:`DistutilsExecError`. Returns the name of the output zip file. diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py index 16164c7f1f..6dd0445dbe 100644 --- a/Lib/distutils/archive_util.py +++ b/Lib/distutils/archive_util.py @@ -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): """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 (if installed and found on the default search path). If neither tool is available, raises DistutilsExecError. Returns the name of the output zip