merge 3.4

2014-11-26 14:36:08 -06:00 · 2014-11-26 14:36:08 -06:00 · 12abc86903
parent d1e22ba7db 5b5350787f
commit 12abc86903
1 changed files with 3 additions and 3 deletions
--- a/Lib/test/test_readline.py
+++ b/Lib/test/test_readline.py
@ -17,7 +17,7 @@ class TestHistoryManipulation (unittest.TestCase):
    why the tests cover only a small subset of the interface.
    """

-    @unittest.skipIf(not hasattr(readline, 'clear_history'),
+    @unittest.skipUnless(hasattr(readline, "clear_history"),
                         "The history update test cannot be run because the "
                         "clear_history method is not available.")
    def testHistoryUpdates(self):