From: Tarek Ziadé <ziade.tarek@gmail.com>
Date: Tue, 23 Feb 2010 05:39:18 +0000 (+0000)
Subject: Merged revisions 78364 via svnmerge from
X-Git-Tag: v3.2a1~1648
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c339978b1bbce8f3003f25e79ba0dc2f16c319cb;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 78364 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78364 | tarek.ziade | 2010-02-23 00:36:41 -0500 (Tue, 23 Feb 2010) | 1 line

  completed the __all__ list and changed the module doctest
........
---

diff --git a/Lib/shutil.py b/Lib/shutil.py
index a324b436c87c..2ddeb2a37301 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -1,4 +1,4 @@
-"""Utility functions for copying files and directory trees.
+"""Utility functions for copying and archiving files and directory trees.
 
 XXX The functions here don't copy the resource fork or other metadata on Mac.
 
@@ -22,9 +22,10 @@ try:
 except ImportError:
     getgrnam = None
 
-__all__ = ["copyfileobj","copyfile","copymode","copystat","copy","copy2",
-           "copytree","move","rmtree","Error", "SpecialFileError",
-           "ExecError","make_archive"]
+__all__ = ["copyfileobj", "copyfile", "copymode", "copystat", "copy", "copy2",
+           "copytree", "move", "rmtree", "Error", "SpecialFileError",
+           "ExecError", "make_archive", "get_archive_formats",
+           "register_archive_format", "unregister_archive_format"]
 
 class Error(EnvironmentError):
     pass