From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 12 Apr 2013 12:44:37 +0000 (+0300)
Subject: #6696: merge with 3.3.
X-Git-Tag: v3.4.0a1~975^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cbc2d29636f129e4cb9329e18c1ee1f03e7a9696;p=python

#6696: merge with 3.3.
---

cbc2d29636f129e4cb9329e18c1ee1f03e7a9696
diff --cc Misc/NEWS
index 83ea595233,2adfb5eba8..17ded2da68
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -87,7 -82,31 +87,10 @@@ Test
  - Issue #17692: test_sqlite now works with unittest test discovery.
    Patch by Zachary Ware.
  
 -Documentation
 --------------
 -
 -- Issue #15940: Specify effect of locale on time functions.
 -
+ - Issue #6696: add documentation for the Profile objects, and improve
+   profile/cProfile docs.  Patch by Tom Pinckney.
+ 
  
 -What's New in Python 3.3.1?
 -===========================
 -
 -*Release date: 07-Apr-2013*
 -
 -Build
 ------
 -
 -- Issue #17550: Fix the --enable-profiling configure switch.
 -
 -Library
 --------
 -
 -- Issue #17625: In IDLE, close the replace dialog after it is used.
 -
 -
  What's New in Python 3.3.1 release candidate 1?
  ===============================================