From: Éric Araujo <merwok@netwok.org>
Date: Sun, 4 Sep 2011 23:53:52 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.2.3rc1~581^2~4^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=17b288cdabcbbc49392077f08a2e9e6284aab262;p=thirdparty%2FPython%2Fcpython.git

Branch merge
---

17b288cdabcbbc49392077f08a2e9e6284aab262
diff --cc Misc/NEWS
index 514d19afedd2,f9eb1cd1dc1c..25bbf3f998f7
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -28,8 -28,9 +28,11 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #8286: The distutils command sdist will print a warning message instead
+   of crashing when an invalid path is given in the manifest template.
+ 
 +- Issue #12878: Expose a __dict__ attribute on io.IOBase and its subclasses.
 +
  - Issue #12636: IDLE reads the coding cookie when executing a Python script.
  
  - Issue #10946: The distutils commands bdist_dumb, bdist_wininst and bdist_msi