diff options
| author | Éric Araujo <merwok@netwok.org> | 2010-12-15 20:33:50 (GMT) |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2010-12-15 20:33:50 (GMT) |
| commit | 6e52cf32adad272fafc97a95f54c9116ace0a063 (patch) | |
| tree | 0896236079d1f722b84df1d7736d53cd7b88acbf | |
| parent | 64a1e7cab1fe8f0b0b42b93bbd40e73fc983c138 (diff) | |
| download | cpython-6e52cf32adad272fafc97a95f54c9116ace0a063.zip cpython-6e52cf32adad272fafc97a95f54c9116ace0a063.tar.gz cpython-6e52cf32adad272fafc97a95f54c9116ace0a063.tar.bz2 | |
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.
........
| -rw-r--r-- | Doc/distutils/apiref.rst | 2 | ||||
| -rw-r--r-- | Lib/distutils/archive_util.py | 2 | ||||
| -rw-r--r-- | Lib/shutil.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst index ae34565..b28a3af 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 c741cc0..834b722 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 diff --git a/Lib/shutil.py b/Lib/shutil.py index 1d86df3..f2d2a90 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -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 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"). 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): """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 ExecError. Returns the name of the output zip |