From: Éric Araujo <merwok@netwok.org>
Date: Fri, 10 Jun 2011 16:34:45 +0000 (+0200)
Subject: Branch merge
X-Git-Tag: v3.3.0a1~2135^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df55334d52ba297e8bba4fd267fde68f48256e1c;p=thirdparty%2FPython%2Fcpython.git

Branch merge
---

df55334d52ba297e8bba4fd267fde68f48256e1c
diff --cc Misc/NEWS
index dd7dedebf72a,e94b77ccdbd3..f2d3ffe28cf0
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -187,16 -187,10 +187,20 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #12246: Warn and fail when trying to install a third-party project from
+   an uninstalled Python (built in a source checkout).  Original patch by
+   Tshepang Lekhonkhobe.
+ 
 +- Issue #10694: zipfile now ignores garbage at the end of a zipfile.
 +
 +- Issue #12283: Fixed regression in smtplib quoting of leading dots in DATA.
 +
 +- Issue #10424: Argparse now includes the names of the missing required
 +  arguments in the missing arguments error message.
 +
 +- Issue #12168: SysLogHandler now allows NUL termination to be controlled using
 +  a new 'append_nul' attribute on the handler.
 +
  - Issue #11583: Speed up os.path.isdir on Windows by using GetFileAttributes
    instead of os.stat.