[Python-checkins] r78366 - in python/branches/py3k: Lib/shutil.py
tarek.ziade
python-checkins at python.org
Tue Feb 23 06:39:18 CET 2010
Author: tarek.ziade
Date: Tue Feb 23 06:39:18 2010
New Revision: 78366
Log:
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
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/shutil.py
Modified: python/branches/py3k/Lib/shutil.py
==============================================================================
--- python/branches/py3k/Lib/shutil.py (original)
+++ python/branches/py3k/Lib/shutil.py Tue Feb 23 06:39:18 2010
@@ -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 @@
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
More information about the Python-checkins
mailing list