]> granicus.if.org Git - python/commitdiff
merge heads
authorBenjamin Peterson <benjamin@python.org>
Fri, 10 Jun 2011 17:32:07 +0000 (12:32 -0500)
committerBenjamin Peterson <benjamin@python.org>
Fri, 10 Jun 2011 17:32:07 +0000 (12:32 -0500)
1  2 
Misc/ACKS
Misc/NEWS

diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
index c80fc6db76a3d9725abffffbec300837ed83391d,f2d3ffe28cf076015e3c711ca4d8a8cbdbaad8f3..c4f1855503a49fcd8b3bc124133494cd5a270e8a
+++ 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.