[Python-checkins] cpython (merge 3.2 -> 2.7): Graft a89d654adaa2 from 3.2 branch. Fixes #15620.

[georg.brandl]

http://hg.python.org/cpython/rev/dda08ec9fbd5
changeset:   78502:dda08ec9fbd5
branch:      2.7
parent:      78492:91382d4e2dfb
parent:      68469:a89d654adaa2
user:        Georg Brandl <georg at python.org>
date:        Sat Aug 11 11:08:04 2012 +0200
summary:
  Graft a89d654adaa2 from 3.2 branch. Fixes #15620.

files:
  Lib/test/test_readline.py |  4 ++++
  Misc/ACKS                 |  1 +
  2 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
--- a/Lib/test/test_readline.py
+++ b/Lib/test/test_readline.py
@@ -12,6 +12,10 @@
 readline = import_module('readline')
 
 class TestHistoryManipulation (unittest.TestCase):
+
+    @unittest.skipIf(not hasattr(readline, 'clear_history'),
+                     "The history update test cannot be run because the "
+                     "clear_history method is not available.")
     def testHistoryUpdates(self):
         readline.clear_history()
 
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -74,6 +74,7 @@
 Steven Bethard
 Stephen Bevan
 Ron Bickers
+Natalia B. Bidart
 David Binger
 Dominic Binks
 Philippe Biondi

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