[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

[terry.reedy]

http://hg.python.org/cpython/rev/8d43e5c1f8b4
changeset:   90655:8d43e5c1f8b4
parent:      90653:d03a267b59da
parent:      90654:7d5aac1650af
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Sun May 11 23:35:35 2014 -0400
summary:
  Merge with 3.4

files:
  Lib/idlelib/idle_test/htest.py |  1 -
  1 files changed, 0 insertions(+), 1 deletions(-)


diff --git a/Lib/idlelib/idle_test/htest.py b/Lib/idlelib/idle_test/htest.py
--- a/Lib/idlelib/idle_test/htest.py
+++ b/Lib/idlelib/idle_test/htest.py
@@ -88,4 +88,3 @@
 
 if __name__ == '__main__':
     runall()
-

-- 
Repository URL: http://hg.python.org/cpython