From d4003d1d26b99feffa87c33ca23a63206f38a38d Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sun, 25 Oct 2015 13:15:06 +0000 Subject: Replace two lists of characters with strings. --- poezio/windows/base_wins.py | 3 +-- poezio/windows/inputs.py | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/poezio/windows/base_wins.py b/poezio/windows/base_wins.py index 8df214d2..f22e41d3 100644 --- a/poezio/windows/base_wins.py +++ b/poezio/windows/base_wins.py @@ -21,8 +21,7 @@ from theming import to_curses_attr, read_tuple FORMAT_CHAR = '\x19' # These are non-printable chars, so they should never appear in the input, # I guess. But maybe we can find better chars that are even less risky. -format_chars = ['\x0E', '\x0F', '\x10', '\x11', '\x12', '\x13', - '\x14', '\x15', '\x16', '\x17', '\x18'] +format_chars = '\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18' # different colors allowed in the input allowed_color_digits = ('0', '1', '2', '3', '4', '5', '6', '7') diff --git a/poezio/windows/inputs.py b/poezio/windows/inputs.py index 80f0c900..f204f1cb 100644 --- a/poezio/windows/inputs.py +++ b/poezio/windows/inputs.py @@ -30,7 +30,7 @@ class Input(Win): passing the list of items that can be used to complete. The completion can be used in a very flexible way. """ - text_attributes = ['b', 'o', 'u', '1', '2', '3', '4', '5', '6', '7', 't'] + text_attributes = 'bou1234567t' clipboard = '' # A common clipboard for all the inputs, this makes # it easy cut and paste text between various input def __init__(self): @@ -463,8 +463,7 @@ class Input(Win): (\x0E to \x19 instead of \x19 + attr). We do not use any } char in this version """ - chars = format_chars[:] - chars.append('\n') + chars = format_chars + '\n' if y is not None and x is not None: self.move(y, x) format_char = find_first_format_char(text, chars) -- cgit v1.2.3