From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Wed, 2 Jan 2013 19:22:58 +0000 (+0200)
Subject: #16748: merge with 3.3.
X-Git-Tag: v3.4.0a1~1706
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=454758224bdef776d6dac7d3369f88d904a3aef3;p=thirdparty%2FPython%2Fcpython.git

#16748: merge with 3.3.
---

454758224bdef776d6dac7d3369f88d904a3aef3
diff --cc Misc/NEWS
index e0fd52d58798,fdc313914e39..161d4fd3113a
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -571,11 -381,8 +571,13 @@@ Extension Module
  Tests
  -----
  
+ - Issue #16748: test_heapq now works with unittest test discovery.
+ 
 +- Issue #10646: Tests rearranged for os.samefile/samestat to check for not
 +  just symlinks but also hard links.
 +
 +- Issue #15302: Switch regrtest from using getopt to using argparse.
 +
  - Issue #15324: Fix regrtest parsing of --fromfile, --match, and --randomize
    options.