summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-06-14 08:45:43 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-06-14 08:45:43 (GMT)
commit6afbc653a7bba73ecc56a6ba37632d25376dbe2f (patch)
treebcec120a14051455328b70343121cf89171a2169
parent11a693d3304eb896de35733848b5bd9f2b5b4ab5 (diff)
downloadcpython-6afbc653a7bba73ecc56a6ba37632d25376dbe2f.zip
cpython-6afbc653a7bba73ecc56a6ba37632d25376dbe2f.tar.gz
cpython-6afbc653a7bba73ecc56a6ba37632d25376dbe2f.tar.bz2
Issue #16182: set_pre_input_hook() may not exist; document, and update test
-rw-r--r--Doc/library/readline.rst7
-rw-r--r--Lib/test/test_readline.py22
2 files changed, 20 insertions, 9 deletions
diff --git a/Doc/library/readline.rst b/Doc/library/readline.rst
index e17e69c..4d3c099 100644
--- a/Doc/library/readline.rst
+++ b/Doc/library/readline.rst
@@ -104,7 +104,9 @@ The following functions operate on a history file:
Append the last *nelements* items of history to a file. The default filename is
:file:`~/.history`. The file must already exist. This calls
- :c:func:`append_history` in the underlying library.
+ :c:func:`append_history` in the underlying library. This function
+ only exists if Python was compiled for a version of the library
+ that supports it.
.. versionadded:: 3.5
@@ -185,7 +187,8 @@ Startup hooks
be used as the new hook function; if omitted or ``None``, any
function already installed is removed. The hook is called
with no arguments after the first prompt has been printed and just before
- readline starts reading input characters.
+ readline starts reading input characters. This function only exists
+ if Python was compiled for a version of the library that supports it.
Completion
diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
index 51e136c..b59b6b0 100644
--- a/Lib/test/test_readline.py
+++ b/Lib/test/test_readline.py
@@ -129,24 +129,32 @@ class TestReadline(unittest.TestCase):
script = r"""import readline
-if readline.__doc__ and "libedit" in readline.__doc__:
- readline.parse_and_bind(r'bind ^B ed-prev-char')
- readline.parse_and_bind(r'bind "\t" rl_complete')
+is_editline = readline.__doc__ and "libedit" in readline.__doc__
+inserted = "[\xEFnserted]"
+macro = "|t\xEB[after]"
+set_pre_input_hook = getattr(readline, "set_pre_input_hook", None)
+if is_editline or not set_pre_input_hook:
# The insert_line() call via pre_input_hook() does nothing with Editline,
# so include the extra text that would have been inserted here
- readline.parse_and_bind('bind -s ^A "[\xEFnserted]|t\xEB[after]"')
+ macro = inserted + macro
+
+if is_editline:
+ readline.parse_and_bind(r'bind ^B ed-prev-char')
+ readline.parse_and_bind(r'bind "\t" rl_complete')
+ readline.parse_and_bind(r'bind -s ^A "{}"'.format(macro))
else:
readline.parse_and_bind(r'Control-b: backward-char')
readline.parse_and_bind(r'"\t": complete')
readline.parse_and_bind(r'set disable-completion off')
readline.parse_and_bind(r'set show-all-if-ambiguous off')
readline.parse_and_bind(r'set show-all-if-unmodified off')
- readline.parse_and_bind('Control-a: "|t\xEB[after]"')
+ readline.parse_and_bind(r'Control-a: "{}"'.format(macro))
def pre_input_hook():
- readline.insert_text("[\xEFnserted]")
+ readline.insert_text(inserted)
readline.redisplay()
-readline.set_pre_input_hook(pre_input_hook)
+if set_pre_input_hook:
+ set_pre_input_hook(pre_input_hook)
def completer(text, state):
if text == "t\xEB":