summaryrefslogtreecommitdiffstats
path: root/Lib/shutil.py
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-08-21 12:30:00 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-08-21 12:30:00 (GMT)
commitc5efe65df319ce881ec358e6854bd37ef026a651 (patch)
treed3b39615fb89994820a8c85dd1f5bee67df92379 /Lib/shutil.py
parent24d1df79ba58ee6cf1f3800540a8fdf6efe1f3b8 (diff)
parent5fa8e7a559be10233c035ac2f29a9a87bf2c4eb7 (diff)
downloadcpython-c5efe65df319ce881ec358e6854bd37ef026a651.zip
cpython-c5efe65df319ce881ec358e6854bd37ef026a651.tar.gz
cpython-c5efe65df319ce881ec358e6854bd37ef026a651.tar.bz2
Merge 3.2
Diffstat (limited to 'Lib/shutil.py')
-rw-r--r--Lib/shutil.py3
1 files changed, 2 insertions, 1 deletions
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 @@ __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):