]> granicus.if.org Git - python/commitdiff
Issue #22812: Fix unittest discovery examples.
authorRobert Collins <rbtcollins@hp.com>
Mon, 24 Aug 2015 00:15:49 +0000 (12:15 +1200)
committerRobert Collins <rbtcollins@hp.com>
Mon, 24 Aug 2015 00:15:49 +0000 (12:15 +1200)
Patch from Pam McA'Nulty.

1  2 
Misc/ACKS
Misc/NEWS

diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
index 5207e83d9da9a92cdd6c502a41ee87a524861bcb,7dd4aa4fd7592a451f4a15660457afaf4c02113e..625e7e6e0e76a473a1b00e30f35269033a4129c4
+++ b/Misc/NEWS
@@@ -129,9 -146,6 +129,12 @@@ IDL
  Documentation
  -------------
  
++- Issue #22812: Fix unittest discovery examples.
++  Patch from Pam McA'Nulty.
++
 +- Issue #23725: Overhaul tempfile docs. Note deprecated status of mktemp.
 +  Patch from Zbigniew JÄ™drzejewski-Szmek.
 +
  - Issue #24129: Clarify the reference documentation for name resolution.
    This includes removing the assumption that readers will be familiar with the
    name resolution scheme Python used prior to the introduction of lexical