summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2010-04-29 13:34:35 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2010-04-29 13:34:35 (GMT)
commitffa155ad83ac40c3eeb55cbe8fe16a304a23cfe1 (patch)
treeb1317a8eb32c18185fb2f852b2eb3d3b0004e107 /Doc/library
parentbf043491a10e65706c0305050de86c91ab2fae62 (diff)
downloadcpython-ffa155ad83ac40c3eeb55cbe8fe16a304a23cfe1.zip
cpython-ffa155ad83ac40c3eeb55cbe8fe16a304a23cfe1.tar.gz
cpython-ffa155ad83ac40c3eeb55cbe8fe16a304a23cfe1.tar.bz2
make sure shutil checks for bz2 availability before it uses it.
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/shutil.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
index 11a1426..e9dfe65 100644
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -238,7 +238,7 @@ Archives operations
*base_name* is the name of the file to create, including the path, minus
any format-specific extension. *format* is the archive format: one of
- "zip", "tar", "bztar" or "gztar".
+ "zip", "tar", "bztar" (if the :mod:`bz2` module is available) or "gztar".
*root_dir* is a directory that will be the root directory of the
archive; i.e. we typically chdir into *root_dir* before creating the
@@ -264,7 +264,7 @@ Archives operations
By default :mod:`shutil` provides these formats:
- *gztar*: gzip'ed tar-file
- - *bztar*: bzip2'ed tar-file
+ - *bztar*: bzip2'ed tar-file (if the :mod:`bz2` module is available.)
- *tar*: uncompressed tar file
- *zip*: ZIP file
@@ -346,7 +346,7 @@ Archives operations
By default :mod:`shutil` provides these formats:
- *gztar*: gzip'ed tar-file
- - *bztar*: bzip2'ed tar-file
+ - *bztar*: bzip2'ed tar-file (if the :mod:`bz2` module is available.)
- *tar*: uncompressed tar file
- *zip*: ZIP file