From: Éric Araujo <merwok@netwok.org>
Date: Sun, 4 Sep 2011 23:55:54 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.3.0a1~1570^2~9^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0df628511aafd2e80a22b831f50f2b6c8e7f7de2;p=thirdparty%2FPython%2Fcpython.git

Branch merge
---

0df628511aafd2e80a22b831f50f2b6c8e7f7de2
diff --cc Misc/NEWS
index 662efe7c61fe,30761e705752..2886160a6a37
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -271,8 -271,9 +271,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 #12494: On error, call(), check_call(), check_output() and