From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 4 Nov 2014 13:52:10 +0000 (+0100)
Subject: Issue #22773: fix failing test with old readline versions due to issue #19884.
X-Git-Tag: v3.5.0a1~526^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e8b8678f141d4e8198002972219895280b2d62d;p=python

Issue #22773: fix failing test with old readline versions due to issue #19884.
---

diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
index 8b778186f1..d2a11f2d02 100644
--- a/Lib/test/test_readline.py
+++ b/Lib/test/test_readline.py
@@ -44,6 +44,10 @@ class TestHistoryManipulation (unittest.TestCase):
 
 
 class TestReadline(unittest.TestCase):
+
+    @unittest.skipIf(readline._READLINE_VERSION < 0x0600
+                     and "libedit" not in readline.__doc__,
+                     "not supported in this library version")
     def test_init(self):
         # Issue #19884: Ensure that the ANSI sequence "\033[1034h" is not
         # written into stdout when the readline module is imported and stdout
diff --git a/Modules/readline.c b/Modules/readline.c
index ae838079e3..f349d3b109 100644
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -1285,5 +1285,9 @@ PyInit_readline(void)
     mod_state = (readlinestate *) PyModule_GetState(m);
     PyOS_ReadlineFunctionPointer = call_readline;
     setup_readline(mod_state);
+
+    PyModule_AddIntConstant(m, "_READLINE_VERSION", RL_READLINE_VERSION);
+    PyModule_AddIntConstant(m, "_READLINE_RUNTIME_VERSION", rl_readline_version);
+
     return m;
 }