summaryrefslogtreecommitdiff
path: root/Lib/distutils/archive_util.py
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2010-12-15 20:33:50 +0000
committerÉric Araujo <merwok@netwok.org>2010-12-15 20:33:50 +0000
commit6e52cf32adad272fafc97a95f54c9116ace0a063 (patch)
tree0896236079d1f722b84df1d7736d53cd7b88acbf /Lib/distutils/archive_util.py
parent64a1e7cab1fe8f0b0b42b93bbd40e73fc983c138 (diff)
downloadcpython-git-6e52cf32adad272fafc97a95f54c9116ace0a063.tar.gz
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. ........
Diffstat (limited to 'Lib/distutils/archive_util.py')
-rw-r--r--Lib/distutils/archive_util.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py
index c741cc0174..834b722ed3 100644
--- a/Lib/distutils/archive_util.py
+++ b/Lib/distutils/archive_util.py
@@ -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):
"""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