commit c5efe65df319ce881ec358e6854bd37ef026a651
author Éric Araujo <merwok@netwok.org> Sun Aug 21 14:30:00 2011 +0200
committer Éric Araujo <merwok@netwok.org> Sun Aug 21 14:30:00 2011 +0200
tree d3b39615fb89994820a8c85dd1f5bee67df92379
parent 24d1df79ba58ee6cf1f3800540a8fdf6efe1f3b8
parent 5fa8e7a559be10233c035ac2f29a9a87bf2c4eb7

Merge 3.2

Lib/shutil.py

diff --git a/Lib/shutil.py b/Lib/shutil.py
index 9ba602f1..2955b04 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -34,7 +34,8 @@
            "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):