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

[georg.brandl]

http://hg.python.org/cpython/rev/36563c91e585
changeset:   78499:36563c91e585
parent:      78497:ecad81ceea05
parent:      78498:961a15aff2a6
user:        Georg Brandl <georg at python.org>
date:        Sat Aug 11 10:59:45 2012 +0200
summary:
  Merge with 3.2.

files:
  Lib/test/test_readline.py |  4 +++-
  1 files changed, 3 insertions(+), 1 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
@@ -17,7 +17,9 @@
                      "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")

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