[Python-checkins] cpython (merge 3.2 -> default): Merge #11496 from 3.2.

[r.david.murray]

http://hg.python.org/cpython/rev/ecc176488349
changeset:   68470:ecc176488349
parent:      68468:0515206e36ed
parent:      68469:a89d654adaa2
user:        R David Murray <rdmurray at bitdance.com>
date:        Mon Mar 14 17:14:29 2011 -0400
summary:
  Merge #11496 from 3.2.

files:
  Misc/ACKS

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()
 

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