From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Thu, 11 Apr 2013 17:30:48 +0000 (+0300)
Subject: #17690: merge with 3.3.
X-Git-Tag: v3.4.0a1~985
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85b2afb1b1f3e24b1ecddfc955b5d4614fc6f39e;p=python

#17690: merge with 3.3.
---

85b2afb1b1f3e24b1ecddfc955b5d4614fc6f39e
diff --cc Misc/NEWS
index 1336f03d06,b8f687b556..7be4c6d029
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -81,6 -74,30 +81,9 @@@ Test
  - Issue #12820: add tests for the xml.dom.minicompat module.
    Patch by John Chandler and Phil Connell.
  
+ - Issue #17690: test_time now works with unittest test discovery.
+   Patch by Zachary Ware.
+ 
 -Documentation
 --------------
 -
 -- Issue #15940: Specify effect of locale on time functions.
 -
 -
 -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?
  ===============================================