diff options
| author | Lucas Hoffmann <lucc@posteo.de> | 2019-11-04 08:00:10 +0100 |
|---|---|---|
| committer | Patrick Totzke <patricktotzke@gmail.com> | 2019-11-06 10:54:00 +0000 |
| commit | 414ca6c4b57752d139598e95e06009c55ff4543c (patch) | |
| tree | a77d60aaf05f2c75224df95f7481f7328e414e7a /alot/account.py | |
| parent | bbb96525c08f0c6ee9fc93e0dd0ccb3abfd1dca8 (diff) | |
Remove unicode literals syntax from python2
Diffstat (limited to 'alot/account.py')
| -rw-r--r-- | alot/account.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/alot/account.py b/alot/account.py index 72b6cef0..a7e82690 100644 --- a/alot/account.py +++ b/alot/account.py @@ -201,7 +201,7 @@ class Account: sent_box=None, sent_tags=None, draft_box=None, draft_tags=None, replied_tags=None, passed_tags=None, abook=None, sign_by_default=False, - encrypt_by_default=u"none", encrypt_to_self=None, + encrypt_by_default="none", encrypt_to_self=None, case_sensitive_username=False, **_): self.address = Address.from_string( address, case_sensitive=case_sensitive_username) @@ -228,17 +228,17 @@ class Account: encrypt_by_default = encrypt_by_default.lower() msg = "Deprecation warning: The format for the encrypt_by_default " \ "option changed. Please use 'none', 'all' or 'trusted'." - if encrypt_by_default in (u"true", u"yes", u"1"): - encrypt_by_default = u"all" + if encrypt_by_default in ("true", "yes", "1"): + encrypt_by_default = "all" logging.info(msg) - elif encrypt_by_default in (u"false", u"no", u"0"): - encrypt_by_default = u"none" + elif encrypt_by_default in ("false", "no", "0"): + encrypt_by_default = "none" logging.info(msg) self.encrypt_by_default = encrypt_by_default # cache alias_regexp regexes if self.alias_regexp != "": self._alias_regexp = re.compile( - u'^' + str(self.alias_regexp) + u'$', + '^' + str(self.alias_regexp) + '$', flags=0 if case_sensitive_username else re.IGNORECASE) def matches_address(self, address): |