From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Tue, 12 Mar 2013 05:50:53 +0000 (+0200)
Subject: #17066: merge with 3.3.
X-Git-Tag: v3.4.0a1~1216
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ce306abf3b7eb0283f885d6c4427be6745fc969;p=python

#17066: merge with 3.3.
---

0ce306abf3b7eb0283f885d6c4427be6745fc969
diff --cc Misc/NEWS
index 607ad5efd2,fd10f5ced5..b062c6ccdc
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -932,8 -662,9 +932,11 @@@ Test
  
  - Issue #15539: Added regression tests for Tools/scripts/pindent.py.
  
 +- Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
 +
+ - Issue #17066: test_robotparser now works with unittest test discovery.
+   Patch by Zachary Ware.
+ 
  - Issue #17334: test_index now works with unittest test discovery.
    Patch by Zachary Ware.