First pylint validation

[imap-restore-mail] / mail_iterator.py

diff --git a/mail_iterator.py b/mail_iterator.py
index 518a8d1..9aebca2 100644 (file)
--- a/mail_iterator.py
+++ b/mail_iterator.py
@@ -24,7 +24,7 @@ class MailIterator:
     # logged in status
     logged_in = None
 
-    def __init__(self, username):
+    def __init__(self, username, server = "/var/imap/socket/imap"):
         """Creates a connection and a user session."""
 
         # connect to server
@@ -32,12 +32,12 @@ class MailIterator:
             self.mail_con = imaplib.IMAP4("intranator.m.i2n")
             # MODIFIED
             imap_socket = socket.socket(socket.AF_UNIX)
-            imap_socket.connect("/var/imap/socket/imap")
+            imap_socket.connect(server)
             self.mail_con.sock = imap_socket
             self.mail_con.file = self.mail_con.sock.makefile('rb')
-            logging.info("Connected to mail server.")
-        except (self.mail_con.error, socket.error) as ex:
-            logging.error("Could not connect to host: %s" % (ex))
+            logging.info("Connected to mail server %s", server)
+        except (socket.error, self.mail_con.error) as ex:
+            logging.error("Could not connect to host: %s", ex)
             sys.exit()
 
         # log in
@@ -45,17 +45,17 @@ class MailIterator:
             self.mail_con.login("cyrus", "geheim")
             self.logged_in = True
             #self.mail_con.proxyauth(username)
-            logging.info("Logged in as %s." % username)
+            logging.info("Logged in as %s.", username)
         except self.mail_con.error as ex:
             self.logged_in = False
-            logging.error("Could not log in as user %s: %s" % (username, ex))
+            logging.error("Could not log in as user %s: %s", username, ex)
             sys.exit()
 
         # list mailboxes
         try:
             _result, mailboxes = self.mail_con.list()
         except self.mail_con.error as ex:
-            logging.warning("Could not retrieve mailboxes for user %s: %s" % (username, ex))
+            logging.warning("Could not retrieve mailboxes for user %s: %s", username, ex)
         self.mailboxes = []
         for mailbox in mailboxes:
             mailbox = MAILBOX_RESP.match(mailbox.decode('iso-8859-1')).groups()
@@ -75,17 +75,17 @@ class MailIterator:
         try:
             _result, inbox_acls = self.mail_con.getacl("INBOX")
         except self.mail_con.error as ex:
-            logging.warning("Could not get the acls of INBOX: %s" % ex)
+            logging.warning("Could not get the acls of INBOX: %s", ex)
             return
         inbox_acls = ACLS_RESP.findall(inbox_acls[0][6:])
-        logging.debug("Retrieved acls from INBOX are %s" % inbox_acls)
+        logging.debug("Retrieved acls from INBOX are %s", inbox_acls)
         for acl_ref in inbox_acls:
             if acl_ref[0] != user:
                 try:
                     self.mail_con.deleteacl("INBOX", acl_ref[0])
-                    logging.debug("Reset acls on INBOX for user %s" % acl_ref[0].decode('iso-8859-1'))
+                    logging.debug("Reset acls on INBOX for user %s", acl_ref[0].decode('iso-8859-1'))
                 except self.mail_con.error as ex:
-                    logging.warning("Could not reset acls on INBOX for user %s: %s" % (acl_ref[0], ex))
+                    logging.warning("Could not reset acls on INBOX for user %s: %s", acl_ref[0], ex)
         return
 
     def add_acls(self, mailbox, mailbox_list, original_user, target_user):
@@ -106,9 +106,9 @@ class MailIterator:
             if acl_user != target_user and acl_user != original_user:
                 try:
                     self.mail_con.setacl(mailbox, acl_user, mbox_acls[acl_user])
-                    logging.debug("Set acls %s for user %s on mailbox %s" % (mbox_acls[acl_user], acl_user, mailbox))
+                    logging.debug("Set acls %s for user %s on mailbox %s", mbox_acls[acl_user], acl_user, mailbox)
                 except self.mail_con.error as ex:
-                    logging.warning("Could not set acls %s for user %s on mailbox %s: %s" % (mbox_acls[acl_user], acl_user, mailbox, ex))    
+                    logging.warning("Could not set acls %s for user %s on mailbox %s: %s", mbox_acls[acl_user], acl_user, mailbox, ex)    
 
         return
 
@@ -122,9 +122,9 @@ class MailIterator:
             if re.compile(pattern).match(mailbox[2]):
                 result, data = self.mail_con.delete(mailbox[2])
                 if result == "OK":
-                    logging.debug("Deleted mailbox %s" % mailbox[2])
+                    logging.debug("Deleted mailbox %s", mailbox[2])
                 else:
-                    logging.warning("Could not delete mailbox %s: %s" % (mailbox[2], data[0]))         
+                    logging.warning("Could not delete mailbox %s: %s", mailbox[2], data[0])         
         return
 
     def create_mailbox(self, mailbox):
@@ -132,16 +132,16 @@ class MailIterator:
         if mailbox != "INBOX":
             result, data = self.mail_con.create(mailbox)
             if result == "OK":
-                logging.debug("Creating mailbox %s" % mailbox)
+                logging.debug("Creating mailbox %s", mailbox)
             else:
-                logging.warning("Could not create mailbox %s: %s" % (mailbox, data[0]))
+                logging.warning("Could not create mailbox %s: %s", mailbox, data[0])
         return
 
     def inject_message(self, message, mailbox, internal_date):
         """Inject a message into a mailbox."""
         result, data = self.mail_con.append(mailbox, "\\Seen", internal_date, message.encode())
         if result == "OK":
-            logging.debug("Appending message to mailbox %s" % mailbox)
+            logging.debug("Appending message to mailbox %s", mailbox)
         else:
-            logging.warning("Could not append the e-mail %s: %s" % (message, data[0]))
+            logging.warning("Could not append the e-mail %s: %s", message, data[0])
         return
\ No newline at end of file