aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDustin Rodrigues <dust.rod@gmail.com>2021-02-15 18:28:24 -0500
committerGitHub <noreply@github.com>2021-02-16 00:28:24 +0100
commit755f3c1521b422bc2177013d289f5439975fdc4f (patch)
treeb5c707af3d3442087470c94ff9a01ff171b55969
parentAdd a warning block around the get_referrers() documentation (GH-24511) (diff)
downloadcpython-755f3c1521b422bc2177013d289f5439975fdc4f.tar.gz
cpython-755f3c1521b422bc2177013d289f5439975fdc4f.tar.bz2
cpython-755f3c1521b422bc2177013d289f5439975fdc4f.zip
bpo-42819, readline: Disable bracketed paste (GH-24108)
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS.d/next/Core and Builtins/2021-01-04-23-54-34.bpo-42819.4KO6wU.rst8
-rw-r--r--Modules/readline.c23
3 files changed, 32 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 29ef9864f98..ca222e4371f 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1461,6 +1461,7 @@ Mark Roddy
Kevin Rodgers
Sean Rodman
Giampaolo Rodola
+Dustin Rodrigues
Mauro S. M. Rodrigues
Elson Rodriguez
Adi Roiban
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-01-04-23-54-34.bpo-42819.4KO6wU.rst b/Misc/NEWS.d/next/Core and Builtins/2021-01-04-23-54-34.bpo-42819.4KO6wU.rst
new file mode 100644
index 00000000000..d067f0bfa76
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2021-01-04-23-54-34.bpo-42819.4KO6wU.rst
@@ -0,0 +1,8 @@
+:mod:`readline`: Explicitly disable bracketed paste in the interactive
+interpreter, even if it's set in the inputrc, is enabled by default (eg GNU
+Readline 8.1), or a user calls ``readline.read_init_file()``. The Python REPL
+has not implemented bracketed paste support. Also, bracketed mode writes the
+``"\x1b[?2004h"`` escape sequence into stdout which causes test failures in
+applications that don't support it. It can still be explicitly enabled by
+calling ``readline.parse_and_bind("set enable-bracketed-paste on")``. Patch by
+Dustin Rodrigues.
diff --git a/Modules/readline.c b/Modules/readline.c
index c900e079543..c79d22f85f8 100644
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -156,6 +156,26 @@ decode(const char *s)
}
+/*
+Explicitly disable bracketed paste in the interactive interpreter, even if it's
+set in the inputrc, is enabled by default (eg GNU Readline 8.1), or a user calls
+readline.read_init_file(). The Python REPL has not implemented bracketed
+paste support. Also, bracketed mode writes the "\x1b[?2004h" escape sequence
+into stdout which causes test failures in applications that don't support it.
+It can still be explicitly enabled by calling readline.parse_and_bind("set
+enable-bracketed-paste on"). See bpo-42819 for more details.
+
+This should be removed if bracketed paste mode is implemented (bpo-39820).
+*/
+
+static void
+disable_bracketed_paste(void)
+{
+ if (!using_libedit_emulation) {
+ rl_variable_bind ("enable-bracketed-paste", "off");
+ }
+}
+
/* Exported function to send one line to readline's init file parser */
/*[clinic input]
@@ -217,6 +237,7 @@ readline_read_init_file_impl(PyObject *module, PyObject *filename_obj)
errno = rl_read_init_file(NULL);
if (errno)
return PyErr_SetFromErrno(PyExc_OSError);
+ disable_bracketed_paste();
Py_RETURN_NONE;
}
@@ -1267,6 +1288,8 @@ setup_readline(readlinestate *mod_state)
else
rl_initialize();
+ disable_bracketed_paste();
+
RESTORE_LOCALE(saved_locale)
return 0;
}