Merge 3.2

c5efe65d · Éric Araujo · 24d1df79 · 5fa8e7a5 · c5efe65d
Commit c5efe65d authored Aug 21, 2011 by Éric Araujo
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

Lib/shutil.py Lib/shutil.py +2 -1

No files found.
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -34,7 +34,8 @@ __all__ = ["copyfileobj", "copyfile", "copymode", "copystat", "copy", "copy2",
           "ExecError", "make_archive", "get_archive_formats",
           "register_archive_format", "unregister_archive_format",
           "get_unpack_formats", "register_unpack_format",
-           "unregister_unpack_format", "unpack_archive"]
+           "unregister_unpack_format", "unpack_archive",
+           "ignore_patterns"]
           # disk_usage is added later, if available on the platform

 class Error(EnvironmentError):