diff options
author | Kali Kaneko <kali@leap.se> | 2016-05-13 11:47:56 -0400 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2016-05-13 11:47:56 -0400 |
commit | e231c0051d593304522a3484c825bb0f501a156e (patch) | |
tree | 78a0102f9c7c95e0b4528d5ac1acac9603a4eb08 | |
parent | d029771d3be72a7acf21f58f36530793e03dda0e (diff) | |
parent | 68604ee5bb8bbda989828e39192973512f92240e (diff) |
Merge branch 'develop' into debian/experimental
-rw-r--r-- | CHANGELOG.rst | 9 | ||||
-rw-r--r-- | MANIFEST.in | 2 | ||||
-rw-r--r-- | changes/next-changelog.rst | 13 | ||||
-rw-r--r-- | src/leap/mail/imap/mailbox.py | 3 |
4 files changed, 14 insertions, 13 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index af315ed..22abf22 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,12 @@ +0.4.2 - 13 May, 2016 ++++++++++++++++++++++ + +Bugfixes +~~~~~~~~ +- `#8083 <https://leap.se/code/issues/8083>`_: Allow pixelated UA not interfere with Thunderbird operation. +- Cast local identity (version string) to bytes, avoid TLS transport raising exception. + + 0.4.1 - 18 Apr, 2016 +++++++++++++++++++++ diff --git a/MANIFEST.in b/MANIFEST.in index 1821bf4..cf9cbd3 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,6 @@ include pkg/* include versioneer.py include LICENSE -include CHANGELOG +include CHANGELOG.rst include README.rst include src/leap/mail/_version.py diff --git a/changes/next-changelog.rst b/changes/next-changelog.rst index 9b2a9d6..e04e423 100644 --- a/changes/next-changelog.rst +++ b/changes/next-changelog.rst @@ -1,4 +1,4 @@ -0.4.1 - xxx +0.4.3 - xxx +++++++++++++++++++++++++++++++ Please add lines to this file, they will be moved to the CHANGELOG.rst during @@ -10,22 +10,11 @@ I've added a new category `Misc` so we can track doc/style/packaging stuff. Features ~~~~~~~~ -- `#7656 <https://leap.se/code/issues/7656>`_: Emit multi-user aware events. -- `#4008 <https://leap.se/code/issues/4008>`_: Add token-based authentication to local IMAP/SMTP services. -- `#7889 <https://leap.se/code/issues/7889>`_: Use cryptography instead of pycryptopp to reduce dependencies. -- `#7263 <https://leap.se/code/issues/7263>`_: Implement local bounces to notify user of SMTP delivery errors. -- Use twisted.cred to authenticate IMAP users. - - `#1234 <https://leap.se/code/issues/1234>`_: Description of the new feature corresponding with issue #1234. - New feature without related issue number. Bugfixes ~~~~~~~~ -- `#7861 <https://leap.se/code/issues/7861>`_: Use the right succeed function for passthrough encrypted email. -- `#7898 <https://leap.se/code/issues/7898>`_: Fix IMAP fetch headers -- `#7977 <https://leap.se/code/issues/7977>`_: Decode attached keys so they are recognized by keymanager. -- Fix the get_body logic for corner-cases in which body is None (yet-to-be synced docs, mainly). - - `#1235 <https://leap.se/code/issues/1235>`_: Description for the fixed stuff corresponding with issue #1235. - Bugfix without related issue number. diff --git a/src/leap/mail/imap/mailbox.py b/src/leap/mail/imap/mailbox.py index d545c00..e70a1d8 100644 --- a/src/leap/mail/imap/mailbox.py +++ b/src/leap/mail/imap/mailbox.py @@ -91,6 +91,9 @@ def make_collection_listener(mailbox): def __init__(self, mbox): self.mbox = mbox + # See #8083, pixelated adaptor seems to be misusing this class. + self.mailbox_name = self.mbox.mbox_name + def __hash__(self): return hash(self.mbox.mbox_name) |