From: Mark Dickinson <dickinsm@gmail.com>
Date: Mon, 26 Oct 2009 12:01:06 +0000 (+0000)
Subject: Merged revisions 75711 via svnmerge from
X-Git-Tag: v3.2a1~2325
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d7062e1b464b0c6e1c66893d86682bebec997e0;p=thirdparty%2FPython%2Fcpython.git

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.
........
---

diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
index b2495a3f131e..5f5a90ac629f 100644
--- a/Lib/test/test_readline.py
+++ b/Lib/test/test_readline.py
@@ -6,9 +6,10 @@ the "real" readline have the same interface for history manipulation. That's
 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):