From: Éric Araujo <merwok@netwok.org>
Date: Sun, 21 Aug 2011 12:30:00 +0000 (+0200)
Subject: Merge 3.2
X-Git-Tag: v3.3.0a1~1653
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c5efe65df319ce881ec358e6854bd37ef026a651;p=thirdparty%2FPython%2Fcpython.git

Merge 3.2
---

c5efe65df319ce881ec358e6854bd37ef026a651
diff --cc Lib/shutil.py
index 9ba602f1ecd2,a0d981b0c727..2955b048b879
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@@ -34,8 -34,7 +34,9 @@@ __all__ = ["copyfileobj", "copyfile", "
             "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"]
++           "unregister_unpack_format", "unpack_archive",
++           "ignore_patterns"]
 +           # disk_usage is added later, if available on the platform
  
  class Error(EnvironmentError):
      pass