From: Plamen Dimitrov <plamen.dimitrov@intra2net.com>
Date: Mon, 2 Jul 2012 13:46:35 +0000 (+0200)
Subject: Some config parameters converted to boolean
X-Git-Url: http://developer.intra2net.com/git/?p=imap-fix-internaldate;a=commitdiff_plain;h=a05fef0aec90ba5bfa20813c18477aa279ddda03

Some config parameters converted to boolean
---

diff --git a/src/fix_imap_internaldate.py b/src/fix_imap_internaldate.py
index a0d698b..99097bb 100644
--- a/src/fix_imap_internaldate.py
+++ b/src/fix_imap_internaldate.py
@@ -72,8 +72,8 @@ def load_configuration():
             config.get('basic_settings', 'console_log_level')
             config.get('basic_settings', 'imap_server')
             config.getint('basic_settings', 'tolerance_mins')
-            config.get('basic_settings', 'skip_shared_folders')
-            config.get('basic_settings', 'fallback_to_date_header')
+            config.getboolean('basic_settings', 'skip_shared_folders')
+            config.getboolean('basic_settings', 'fallback_to_date_header')
     except configparser.NoOptionError:
         success = []
     except ValueError:
@@ -87,8 +87,8 @@ def load_configuration():
         config.set('basic_settings', 'console_log_level', logging.INFO)
         config.set('basic_settings', 'imap_server', 'imap.company.com')
         config.set('basic_settings', 'tolerance_mins', 30)
-        config.set('basic_settings', 'skip_shared_folders', "ON")
-        config.set('basic_settings', 'fallback_to_date_header', "OFF")
+        config.set('basic_settings', 'skip_shared_folders', True)
+        config.set('basic_settings', 'fallback_to_date_header', False)
         with open(CONFIG_FILENAME, 'w') as configfile:
             config.write(configfile)
             configfile.write("# 0 NOTSET, 10 DEBUG, 20 INFO, 30 WARNING, 40 ERROR, 50 CRITICAL")
@@ -129,7 +129,7 @@ def synchronize_csv(config, test_mode):
     for user in user_reader:
         try:
             session = MailIterator(server, user['username'], user['password'],
-                                   config.get('basic_settings', 'skip_shared_folders')=="ON")
+                                   config.getboolean('basic_settings', 'skip_shared_folders'))
         except UserWarning as ex:
             logging.error(ex)
             continue
@@ -154,7 +154,7 @@ def synchronize_csv(config, test_mode):
                                         mid.decode('iso-8859-1'), box.name, box.owner)
                         box.no_received_field += 1
                         # correct these messages if required and override received_date from basic date
-                        if(config.get('basic_settings', 'fallback_to_date_header') == "ON"):
+                        if(config.getboolean('basic_settings', 'fallback_to_date_header')):
                             fetched_correct_date = session.fetch_basic_date(mid)
                             correct_date = date_parser.extract_received_date(fetched_correct_date)
                         else:
diff --git a/src/mail_iterator.py b/src/mail_iterator.py
index 0ff1089..f35866a 100644
--- a/src/mail_iterator.py
+++ b/src/mail_iterator.py
@@ -23,6 +23,8 @@ import logging
 MAILBOX_RESP = re.compile(r'\((?P<flags>.*?)\) "(?P<delimiter>.*)" (?P<name>.*)')
 UIDVAL_RESP = re.compile(r'(?P<name>.*) \(UIDVALIDITY (?P<uidval>.*)\)')
 
+#imaplib.Debug = 4
+
 class MailIterator:
     """This class communicates with the e-mail server."""