[Python-checkins] r75712 - in python/branches/py3k: Lib/test/test_readline.py

[mark.dickinson]

Author: mark.dickinson
Date: Mon Oct 26 13:01:06 2009
New Revision: 75712

Log:
Merged revisions 75711 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r75711 | mark.dickinson | 2009-10-26 11:59:30 +0000 (Mon, 26 Oct 2009) | 1 line
  
  Skip readline tests if readline module is not available.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/test/test_readline.py

Modified: python/branches/py3k/Lib/test/test_readline.py
==============================================================================
--- python/branches/py3k/Lib/test/test_readline.py	(original)
+++ python/branches/py3k/Lib/test/test_readline.py	Mon Oct 26 13:01:06 2009
@@ -6,9 +6,10 @@
 why the tests cover only a small subset of the interface.
 """
 import unittest
-from test.support import run_unittest
+from test.support import run_unittest, import_module
 
-import readline
+# Skip tests if there is no readline module
+readline = import_module('readline')
 
 class TestHistoryManipulation (unittest.TestCase):
     def testHistoryUpdates(self):