diff options
| author | Tarek Ziadé <ziade.tarek@gmail.com> | 2010-02-23 05:39:18 (GMT) |
|---|---|---|
| committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2010-02-23 05:39:18 (GMT) |
| commit | c339978b1bbce8f3003f25e79ba0dc2f16c319cb (patch) | |
| tree | c316b021c911d034ea351dbae8e65c91b62d7d9d /Lib/shutil.py | |
| parent | 396fad7a47072895d9153c60ee91e8b5327c8a4d (diff) | |
| download | cpython-c339978b1bbce8f3003f25e79ba0dc2f16c319cb.zip cpython-c339978b1bbce8f3003f25e79ba0dc2f16c319cb.tar.gz cpython-c339978b1bbce8f3003f25e79ba0dc2f16c319cb.tar.bz2 | |
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
........
Diffstat (limited to 'Lib/shutil.py')
| -rw-r--r-- | Lib/shutil.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py index a324b43..2ddeb2a 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 |