mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 80221 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80221 | tarek.ziade | 2010-04-19 23:28:21 +0200 (Mon, 19 Apr 2010) | 1 line

  Fixed #8463: added missing reference to bztar in shutil's documentation.
........
This commit is contained in:
Tarek Ziadé 2010-04-19 21:31:42 +00:00
parent 1eab9ccd0d
commit 10a51afc80
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/library/shutil.rst
View file

@ -221,7 +221,7 @@ Archives operations
*base_name* is the name of the file to create, including the path, minus *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 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 *root_dir* is a directory that will be the root directory of the
archive; ie. we typically chdir into *root_dir* before creating the archive; ie. we typically chdir into *root_dir* before creating the

2
Lib/shutil.py
View file

@ -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 '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", 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 'root_dir' is a directory that will be the root directory of the
archive; ie. we typically chdir into 'root_dir' before creating the archive; ie. we typically chdir into 'root_dir' before creating the

2
Misc/NEWS
View file

@ -318,6 +318,8 @@ C-API
Library 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 - 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'). (as long as the user didn't specify 'automatic proxy configuration').