From e1634fba862738c79ad9ad0a47ece9a27e004fa1 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Tue, 24 Apr 2018 14:30:16 -0700 Subject: Fix some formatting requests for @lucc --- alot/commands/thread.py | 7 ++----- tests/db/utils_test.py | 10 +++++----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/alot/commands/thread.py b/alot/commands/thread.py index 5d8a7939..ad854a5a 100644 --- a/alot/commands/thread.py +++ b/alot/commands/thread.py @@ -245,11 +245,8 @@ class ReplyCommand(Command): # Reply-To is standart reply target RFC 2822:, RFC 1036: 2.2.1 # X-BeenThere is needed by sourceforge ML also winehq # X-Mailing-List is also standart and is used by git-send-mail - to = ( - mail['Reply-To'] - or mail['X-BeenThere'] - or mail['X-Mailing-List'] - ) + to = mail['Reply-To'] or mail['X-BeenThere'] or mail['X-Mailing-List'] + # Some mail server (gmail) will not resend you own mail, so you # have to deal with the one in sent if to is None: diff --git a/tests/db/utils_test.py b/tests/db/utils_test.py index 25c3641d..ed3a5c1b 100644 --- a/tests/db/utils_test.py +++ b/tests/db/utils_test.py @@ -319,11 +319,11 @@ class TestDecodeHeader(unittest.TestCase): ' again: ' + self._quote(part, 'utf-8') + \ ' latin1: ' + self._base64(part, 'iso-8859-1') + \ ' and ' + self._quote(part, 'iso-8859-1') - expected = u' '.join([ - u'utf-8: ÄÖÜäöü', - u'again: ÄÖÜäöü', - u'latin1: ÄÖÜäöü and ÄÖÜäöü', - ]) + expected = ( + u'utf-8: ÄÖÜäöü' + u'again: ÄÖÜäöü' + u'latin1: ÄÖÜäöü and ÄÖÜäöü' + ) self._test(text, expected) def test_tabs_are_expanded_to_align_with_eigth_spaces(self): -- cgit v1.2.3