diff options
| author | Ben Finney <ben+python@benfinney.id.au> | 2018-04-23 16:37:22 +1000 |
|---|---|---|
| committer | Ben Finney <ben@benfinney.id.au> | 2018-04-23 19:54:46 +1000 |
| commit | 1708fd59ed2a44bd543d510a4895aa95e30c9af3 (patch) | |
| tree | e79066bddfe4270c91f242fcb91feeb61392a52a | |
| parent | 018279b18e7c95b40d94a09fc68fa3b3aa1fc6b0 (diff) | |
Extract a level of nested control flow.
| -rw-r--r-- | alot/commands/thread.py | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/alot/commands/thread.py b/alot/commands/thread.py index 6a631e62..5d8a7939 100644 --- a/alot/commands/thread.py +++ b/alot/commands/thread.py @@ -83,22 +83,23 @@ def determine_sender(mail, action='reply'): re.IGNORECASE if not account.address.case_sensitive else 0)) for seen_name, seen_address in candidate_addresses: - if regex.match(seen_address): - logging.debug("match!: '%s' '%s'", seen_address, alias) - if settings.get(action + '_force_realname'): - realname = account.realname - else: - realname = seen_name - if settings.get(action + '_force_address'): - address = account.address - else: - address = seen_address - - logging.debug('using realname: "%s"', realname) - logging.debug('using address: %s', address) - - from_value = formataddr((realname, str(address))) - return from_value, account + if not regex.match(seen_address): + continue + logging.debug("match!: '%s' '%s'", seen_address, alias) + if settings.get(action + '_force_realname'): + realname = account.realname + else: + realname = seen_name + if settings.get(action + '_force_address'): + address = account.address + else: + address = seen_address + + logging.debug('using realname: "%s"', realname) + logging.debug('using address: %s', address) + + from_value = formataddr((realname, str(address))) + return from_value, account # revert to default account if nothing found account = my_accounts[0] |