[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/6528f943c1bd
changeset:   93605:6528f943c1bd
parent:      93603:031ab6d4a0f3
parent:      93604:812f31cbe6be
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Nov 26 14:36:08 2014 -0600
summary:
  merge 3.4

files:
  Lib/test/test_readline.py |  6 +++---
  1 files changed, 3 insertions(+), 3 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,9 +17,9 @@
     why the tests cover only a small subset of the interface.
     """
 
-    @unittest.skipIf(not hasattr(readline, 'clear_history'),
-                     "The history update test cannot be run because the "
-                     "clear_history method is not available.")
+    @unittest.skipUnless(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: https://hg.python.org/cpython