From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 11 Jun 2011 20:56:46 +0000 (-0500)
Subject: merge 3.2 (#9284)
X-Git-Tag: v3.3.0a1~2127
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=703f7c4bf5fa98f9b8b11593d3fa37eb68eae896;p=python

merge 3.2 (#9284)
---

703f7c4bf5fa98f9b8b11593d3fa37eb68eae896
diff --cc Misc/NEWS
index 5b3a372dd5,de1c531025..e2538fcd7b
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -187,22 -22,11 +187,25 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #12240: Allow multiple setup hooks in packaging's setup.cfg files.
 +  Original patch by Erik Bray.
 +
+ - Issue #9284: Allow inspect.findsource() to find the source of doctest
+   functions.
+ 
 +- Issue #11595: Fix assorted bugs in packaging.util.cfg_to_args, a
 +  compatibility helper for the distutils-packaging transition.  Original patch
 +  by Erik Bray.
 +
 +- Issue #12287: In ossaudiodev, check that the device isn't closed in several
 +  methods.
 +
  - 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.