Merge with 3.2.

2012-08-11 10:59:45 +02:00 · 2012-08-11 10:59:45 +02:00 · 68fad6fb37
parent 675a77d8fb 22bfa37ed0
commit 68fad6fb37
1 changed files with 3 additions and 1 deletions
--- a/Lib/test/test_readline.py
+++ b/Lib/test/test_readline.py
@ -17,7 +17,9 @@ class TestHistoryManipulation (unittest.TestCase):
                     "The history update test cannot be run because the "
                     "clear_history method is not available.")
    def testHistoryUpdates(self):
-        readline.clear_history()
+        # Some GNU versions of readline do not support clear_history
+        if hasattr('readline', 'clear_history'):
+            readline.clear_history()

        readline.add_history("first line")
        readline.add_history("second line")