debian/patches/python3.patch: Dropped, merged upstream
Boyuan Yang
3 years ago
| 0 | Description: Fix inconsistent use of tabs in indentation | |
| 1 | Origin: upstream, https://github.com/lexical/ibus-array/commit/8c062b2e3a391ae17a326173d3c264d1c62ed59f#diff-18c70dbb4742ed660c4005f739b7d7fc | |
| 2 | ||
| 3 | commit 8c062b2e3a391ae17a326173d3c264d1c62ed59f | |
| 4 | Author: OBATA Akio <obache@outlook.com> | |
| 5 | Date: Tue May 21 14:27:41 2019 +0900 | |
| 6 | ||
| 7 | Fix inconsistent use of tabs in indentation | |
| 8 | ||
| 9 | It result in TabError on Python3 with inconsistent use of tabs and | |
| 10 | spaces in indentation. Change to use spaces instead of tabs as | |
| 11 | Style Guide for Python (PEP 8). | |
| 12 | ||
| 13 | diff --git a/setup/main.py b/setup/main.py | |
| 14 | index 9142340..93bd571 100644 | |
| 15 | --- a/setup/main.py | |
| 16 | +++ b/setup/main.py | |
| 17 | @@ -36,8 +36,8 @@ class Setup: | |
| 18 | self.__create_ui() | |
| 19 | ||
| 20 | def __create_ui(self): | |
| 21 | - gettext.bindtextdomain("ibus-array") | |
| 22 | - gettext.textdomain("ibus-array") | |
| 23 | + gettext.bindtextdomain("ibus-array") | |
| 24 | + gettext.textdomain("ibus-array") | |
| 25 | self.__window = Gtk.Dialog(_('ibus-array setup'), None, | |
| 26 | Gtk.DialogFlags.MODAL, | |
| 27 | (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, | |
| 28 | @@ -95,9 +95,9 @@ class Setup: | |
| 29 | self.__special_notify_button.set_active(False) | |
| 30 | ||
| 31 | def __read(self, name, v): | |
| 32 | - value = self.__config.get_value("engine/Array", name) | |
| 33 | - if value is None: | |
| 34 | - return v | |
| 35 | + value = self.__config.get_value("engine/Array", name) | |
| 36 | + if value is None: | |
| 37 | + return v | |
| 38 | return value | |
| 39 | ||
| 40 | def __write(self, name, v): |