Patchwork [1/1] python: fix importing readline with probably escape sequence output

login
register
mail settings
Submitter Hongxu Jia
Date July 18, 2013, 10:55 a.m.
Message ID <6cb2efa600f580748a228b8e8577479c76140368.1374140808.git.hongxu.jia@windriver.com>
Download mbox | patch
Permalink /patch/53947/
State New
Headers show

Comments

Hongxu Jia - July 18, 2013, 10:55 a.m.
While imports readline in python, if the term in terminfo is available and
it contains the variable 'km' and 'smm', the readline initialization will
output the value of 'smm' which is the escape sequence '\E[?1034h'.

'km' means the terminal has a meta key which is a special key on MIT keyboards,
'smm' means turn on the meta key if this terminal has one. They don't exist in
term 'dumb'.

Explicitly use dumb as default terminal to avoid probably escape sequence
output. The dumb is used to label tty lines when you don't know what kind
of terminal is on it. The characteristics of an unknown terminal are the
lowest common denominator.

[YOCTO #4835]
[YOCTO #4732]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta/recipes-devtools/python/python.inc            |  4 ++-
 ...e-explicitly-use-dumb-as-default-terminal.patch | 35 ++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/python/python/readline-explicitly-use-dumb-as-default-terminal.patch
Saul Wold - July 18, 2013, 4:36 p.m.
On 07/18/2013 03:55 AM, Hongxu Jia wrote:
> While imports readline in python, if the term in terminfo is available and
> it contains the variable 'km' and 'smm', the readline initialization will
> output the value of 'smm' which is the escape sequence '\E[?1034h'.
>
> 'km' means the terminal has a meta key which is a special key on MIT keyboards,
> 'smm' means turn on the meta key if this terminal has one. They don't exist in
> term 'dumb'.
>
> Explicitly use dumb as default terminal to avoid probably escape sequence
> output. The dumb is used to label tty lines when you don't know what kind
> of terminal is on it. The characteristics of an unknown terminal are the
> lowest common denominator.
>
> [YOCTO #4835]
> [YOCTO #4732]
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
>   meta/recipes-devtools/python/python.inc            |  4 ++-
>   ...e-explicitly-use-dumb-as-default-terminal.patch | 35 ++++++++++++++++++++++
>   2 files changed, 38 insertions(+), 1 deletion(-)
>   create mode 100644 meta/recipes-devtools/python/python/readline-explicitly-use-dumb-as-default-terminal.patch
>
> diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc
> index 80609a8..2fc894d 100644
> --- a/meta/recipes-devtools/python/python.inc
> +++ b/meta/recipes-devtools/python/python.inc
> @@ -7,7 +7,9 @@ INC_PR = "r0"
>
>   LIC_FILES_CHKSUM = "file://LICENSE;md5=ed3abfd1059e2d3a36a8cff3986f9bb6"
>
> -SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2"
> +SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
> +           file://readline-explicitly-use-dumb-as-default-terminal.patch \
> +"
>
>   SRC_URI[md5sum] = "c57477edd6d18bd9eeca2f21add73919"
>   SRC_URI[sha256sum] = "726457e11cb153adc3f428aaf1901fc561a374c30e5e7da6742c0742a338663c"
> diff --git a/meta/recipes-devtools/python/python/readline-explicitly-use-dumb-as-default-terminal.patch b/meta/recipes-devtools/python/python/readline-explicitly-use-dumb-as-default-terminal.patch
> new file mode 100644
> index 0000000..11928d1
> --- /dev/null
> +++ b/meta/recipes-devtools/python/python/readline-explicitly-use-dumb-as-default-terminal.patch
> @@ -0,0 +1,35 @@
> +readline: explicitly use dumb as default terminal
> +
> +Explicitly use dumb as default terminal to avoid probably
> +escape sequence output. The dumb is used to label tty lines
> +when you don't know what kind of terminal is on it. The
> +characteristics of an unknown terminal are the lowest common
> +denominator.
> +
> +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> +Upstream-Status: inappropriate [oe specific]
> +---
> + Modules/readline.c | 8 ++++++++
> + 1 file changed, 8 insertions(+)
> +
> +diff --git a/Modules/readline.c b/Modules/readline.c
> +--- a/Modules/readline.c
> ++++ b/Modules/readline.c
> +@@ -882,6 +882,14 @@ setup_readline(void)
> + #endif
> +     /* Force rebind of TAB to insert-tab */
> +     rl_bind_key('\t', rl_insert);
> ++
> ++    /* Explicitly use dumb as default terminal to avoid probably
> ++     * escape sequence output. The dumb is used to label tty lines
> ++     * when you don't know what kind of terminal is on it. The
> ++     * characteristics of an unknown terminal are the lowest common
> ++     * denominator.
> ++     */
> ++    rl_terminal_name = "dumb";
I don't think this will work, since it will force all terminal 
interactions that use python to be dumb, how will the bitbake knotty 
interface behave with dumb terminal.

Sau!

> +     /* Bind both ESC-TAB and ESC-ESC to the completion function */
> +     rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
> +     rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
> +--
> +1.8.1.2
> +
>

Patch

diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc
index 80609a8..2fc894d 100644
--- a/meta/recipes-devtools/python/python.inc
+++ b/meta/recipes-devtools/python/python.inc
@@ -7,7 +7,9 @@  INC_PR = "r0"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ed3abfd1059e2d3a36a8cff3986f9bb6"
 
-SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2"
+SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.bz2 \
+           file://readline-explicitly-use-dumb-as-default-terminal.patch \
+"
  
 SRC_URI[md5sum] = "c57477edd6d18bd9eeca2f21add73919"
 SRC_URI[sha256sum] = "726457e11cb153adc3f428aaf1901fc561a374c30e5e7da6742c0742a338663c"
diff --git a/meta/recipes-devtools/python/python/readline-explicitly-use-dumb-as-default-terminal.patch b/meta/recipes-devtools/python/python/readline-explicitly-use-dumb-as-default-terminal.patch
new file mode 100644
index 0000000..11928d1
--- /dev/null
+++ b/meta/recipes-devtools/python/python/readline-explicitly-use-dumb-as-default-terminal.patch
@@ -0,0 +1,35 @@ 
+readline: explicitly use dumb as default terminal
+
+Explicitly use dumb as default terminal to avoid probably
+escape sequence output. The dumb is used to label tty lines
+when you don't know what kind of terminal is on it. The
+characteristics of an unknown terminal are the lowest common
+denominator.
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+Upstream-Status: inappropriate [oe specific] 
+---
+ Modules/readline.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/Modules/readline.c b/Modules/readline.c
+--- a/Modules/readline.c
++++ b/Modules/readline.c
+@@ -882,6 +882,14 @@ setup_readline(void)
+ #endif
+     /* Force rebind of TAB to insert-tab */
+     rl_bind_key('\t', rl_insert);
++
++    /* Explicitly use dumb as default terminal to avoid probably
++     * escape sequence output. The dumb is used to label tty lines
++     * when you don't know what kind of terminal is on it. The
++     * characteristics of an unknown terminal are the lowest common
++     * denominator.
++     */
++    rl_terminal_name = "dumb";
+     /* Bind both ESC-TAB and ESC-ESC to the completion function */
+     rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
+     rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
+-- 
+1.8.1.2
+