[Python-checkins] r80224 - in python/branches/py3k: Doc/library/shutil.rst Lib/shutil.py Misc/NEWS

tarek.ziade python-checkins at python.org
Mon Apr 19 23:31:42 CEST 2010


Author: tarek.ziade
Date: Mon Apr 19 23:31:42 2010
New Revision: 80224

Log:
Merged revisions 80221 via svnmerge from 
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.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/library/shutil.rst
   python/branches/py3k/Lib/shutil.py
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Doc/library/shutil.rst
==============================================================================
--- python/branches/py3k/Doc/library/shutil.rst	(original)
+++ python/branches/py3k/Doc/library/shutil.rst	Mon Apr 19 23:31:42 2010
@@ -221,7 +221,7 @@
 
    *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

Modified: python/branches/py3k/Lib/shutil.py
==============================================================================
--- python/branches/py3k/Lib/shutil.py	(original)
+++ python/branches/py3k/Lib/shutil.py	Mon Apr 19 23:31:42 2010
@@ -523,7 +523,7 @@
 
     '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

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Mon Apr 19 23:31:42 2010
@@ -318,6 +318,8 @@
 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').
 


More information about the Python-checkins mailing list