From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 8 Jun 2013 21:10:04 +0000 (+0300)
Subject: #17691: merge with 3.3.
X-Git-Tag: v3.4.0a1~549
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f103d55b2acb0ed0352e407249f2734b65c4b874;p=python

#17691: merge with 3.3.
---

f103d55b2acb0ed0352e407249f2734b65c4b874
diff --cc Misc/NEWS
index e0bd2093a2,5707f041c2..b337d48467
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -379,6 -313,6 +379,9 @@@ Test
  - Issue #12820: add tests for the xml.dom.minicompat module.
    Patch by John Chandler and Phil Connell.
  
++- Issue #17691: test_univnewlines now works with unittest test discovery.
++  Patch by Zachary Ware.
++
  - Issue #17790: test_set now works with unittest test discovery.
    Patch by Zachary Ware.