cleanup

python/src/deltachat/direct_imap.py

@@ -14,23 +14,23 @@ def db_folder_attr(name):
 class ImapConn:
     def __init__(self, account):
         self.account = account
-        host = account.get_config("configured_mail_server"),
-        user = account.get_config("addr"),
-        pw = account.get_config("mail_pw"))
+        host = account.get_config("configured_mail_server")
+        user = account.get_config("addr")
+        pw = account.get_config("mail_pw")
         self.connection = imaplib.IMAP4_SSL(host)
         self.connection.login(user, pw)
         self._original_msg_count = {}
         self.select_folder("INBOX")
 
     def shutdown(self):
-        try:
-            self.connection.logout()
-        except Exception:
-            print("Could not logout direct_imap conn")
         try:
             self.connection.close()
         except Exception:
             pass
+        try:
+            self.connection.logout()
+        except Exception:
+            print("Could not logout direct_imap conn")
 
     def select_folder(self, foldername):
         status, messages = self.connection.select(foldername)

python/tests/test_account.py

@@ -1505,11 +1505,9 @@ class TestOnlineAccount:
         ac1._evtracker.get_matching("DC_EVENT_SMTP_MESSAGE_SENT")
 
         lp.sec("ac2: wait for incoming location message")
-        # ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG")  # "enabled-location streaming"
 
         # currently core emits location changed before event_incoming message
         ac2._evtracker.get_matching("DC_EVENT_LOCATION_CHANGED")
-        # ac2._evtracker.get_matching("DC_EVENT_INCOMING_MSG")  # text message with location
 
         locations = chat2.get_locations()
         assert len(locations) == 1