diff options
| -rw-r--r-- | Doc/library/shutil.rst | 2 | ||||
| -rw-r--r-- | Lib/shutil.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst index 2d1e585..9d06903 100644 --- a/Doc/library/shutil.rst +++ b/Doc/library/shutil.rst @@ -221,7 +221,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", "ztar", or "gztar". + "zip", "tar", "ztar", "bztar" or "gztar". *root_dir* is a directory that will be the root directory of the archive; ie. we typically chdir into *root_dir* before creating the diff --git a/Lib/shutil.py b/Lib/shutil.py index 6688119..8ad0c64 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -523,7 +523,7 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0, 'base_name' is the name of the file to create, minus any format-specific extension; 'format' is the archive format: one of "zip", "tar", "ztar", - or "gztar". + "bztar" or "gztar". 'root_dir' is a directory that will be the root directory of the archive; ie. we typically chdir into 'root_dir' before creating the @@ -318,6 +318,8 @@ C-API Library ------- +- Issue #8463: added missing reference to bztar in shutil's documentation. + - Issue #7154: urllib.request can now detect the proxy settings on OSX 10.6 (as long as the user didn't specify 'automatic proxy configuration'). |