summaryrefslogtreecommitdiff
path: root/Lib/shutil.py
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-08-26 16:32:36 +0200
committerÉric Araujo <merwok@netwok.org>2011-08-26 16:32:36 +0200
commit1bd3b9cea06b541e9329709df06d9d188bc3ff86 (patch)
treed71932587b7301fdcd573febcd5d937238180946 /Lib/shutil.py
parent2a34eb31040ad3eb2f09e22a0237afa98755390d (diff)
parentcf13c866b15961f29afc2a313ac60c94ee0f59ea (diff)
downloadcpython-git-1bd3b9cea06b541e9329709df06d9d188bc3ff86.tar.gz
Branch merge
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 59a38fef76..be83251104 100644
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -25,7 +25,8 @@ except ImportError:
__all__ = ["copyfileobj", "copyfile", "copymode", "copystat", "copy", "copy2",
"copytree", "move", "rmtree", "Error", "SpecialFileError",
"ExecError", "make_archive", "get_archive_formats",
- "register_archive_format", "unregister_archive_format"]
+ "register_archive_format", "unregister_archive_format",
+ "ignore_patterns"]
class Error(EnvironmentError):
pass