From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 10 Jun 2011 17:32:07 +0000 (-0500)
Subject: merge heads
X-Git-Tag: v3.3.0a1~2135
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49aaad3c476abe77e9d90d20a7622fa5b1f5c38c;p=python

merge heads
---

49aaad3c476abe77e9d90d20a7622fa5b1f5c38c
diff --cc Misc/NEWS
index c80fc6db76,f2d3ffe28c..c4f1855503
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -187,8 -187,10 +187,12 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #12009: Fixed regression in netrc file comment handling.
 +
+ - 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.