Merge branch 'pycryptodome'

checkmailslib/constants.py

@@ -231,7 +231,10 @@ def encrypt(mailbox, pwd, server, login, password, folder):
     info = [server, login, password, folder]
     with open(os.path.join(LOCAL_PATH, mailbox), 'wb') as fich:
         fich.write(iv)
-        fich.write(cipher.encrypt("\n".join(info)))
+        try:
+            fich.write(cipher.encrypt("\n".join(info)))
+        except TypeError:
+            fich.write(cipher.encrypt("\n".join(info).encode()))
 
 
 # --- Images

checkmailslib/trayicon/tkicon.py

@@ -24,7 +24,7 @@
 It follows http://www.freedesktop.org specifications when looking up the
 system tray manager.
 """
-    
+
 import tkinter
 from checkmailslib.constants import PhotoImage
 
@@ -169,7 +169,8 @@ def change_icon(self, icon, desc):
 
     def loop(self, tk_window):
         # no need to update since it is part of the tk mainloop
-        tk_window.loop_id = ""
+        self.update_idletasks()
+        tk_window.loop_id = tk_window.after(10, self.loop, tk_window)
 
     def get_item_label(self, item):
         return self.menu.entrycget(item, 'label')