Fix various codingstyle issues

Author: hannob

courier/config.py

@@ -279,7 +279,7 @@ def get_alias(address):
 def smtpaccess(ip):
     """ Return the courier smtpaccess value associated with the IP address."""
     # First break the IP address into parts, either IPv4 or IPv6
-    if '.' in  ip:
+    if '.' in ip:
         ipsep = '.'
     elif ':' in ip:
         ipsep = ':'
@@ -376,6 +376,8 @@ def get_block_val(ip):
 
 _standard_config_paths = ['/etc/pythonfilter-modules.conf',
                           '/usr/local/etc/pythonfilter-modules.conf']
+
+
 def get_module_config(module_name):
     """Return a dictionary of config values.
 

courier/control.py

@@ -129,7 +129,7 @@ def _get_recipients_from_file(control_path):
 
     """
     recipients = []
-    rbuf = ['', '', ''] # This list will contain the recipient data.
+    rbuf = ['', '', '']  # This list will contain the recipient data.
     with open(control_path, 'rb') as control_file:
         for control_line in control_file:
             control_key = control_line[:1]
@@ -256,7 +256,7 @@ def add_recipient_data(control_paths, recipient_data):
 def _mark_complete(control_path, recipient_index):
     """Mark a single recipient's delivery as completed."""
     with open(control_path, 'a') as control_file:
-        control_file.seek(0, 2) # Seek to the end of the file
+        control_file.seek(0, 2)  # Seek to the end of the file
         control_file.write('I%d R 250 Ok - Removed by courier.control.py\n' %
                            recipient_index)
         control_file.write('S%d %d\n' % (recipient_index, int(time.time())))
@@ -279,8 +279,8 @@ def del_recipient(control_paths, recipient):
     for control_path in control_paths:
         rcpts = _get_recipients_from_file(control_path)
         for rcpt in rcpts:
-            if(rcpt[1] is False # Delivery is not complete for this recipient
-               and rcpt[2][0] == recipient):
+            if (rcpt[1] is False  # Delivery is not complete for this recipient
+                and rcpt[2][0] == recipient):
                 _mark_complete(control_path, rcpt[0])
                 return
 
@@ -305,8 +305,8 @@ def del_recipient_data(control_paths, recipient_data):
     for cf in control_paths:
         rcpts = _get_recipients_from_file(cf)
         for x in rcpts:
-            if(x[1] is False # Delivery is not complete for this recipient
-               and x[2] == recipient_data):
+            if (x[1] is False  # Delivery is not complete for this recipient
+                and x[2] == recipient_data):
                 _mark_complete(cf, x[0])
                 return
 
@@ -327,6 +327,7 @@ def get_auth_user(control_paths, body_file=None):
         return auth_lines[0]
     return None
 
+
 # Deprecated names preserved for compatibility with older releases
 getLines = get_lines
 getSendersMta = get_senders_mta

courier/quarantine.py

@@ -51,7 +51,7 @@ def _get_db():
     lock = open(lockpath, 'w')
     fcntl.flock(lock, fcntl.LOCK_EX)
     dbm_file = dbm.open(dbmpath, 'c')
-    return(dbm_file, lock)
+    return (dbm_file, lock)
 
 
 def _close_db(dbm_file, lock):
@@ -72,8 +72,8 @@ def send_notice(message, address, sender=None):
     # Send the recipient a notice if notify_recipient isn't
     # available, or if it is present and a true value.
     rcpts = []
-    if('notify_recipient' not in config
-       or config['notify_recipient']):
+    if ('notify_recipient' not in config
+        or config['notify_recipient']):
         rcpts.append(address)
     if 'also_notify' in config and config['also_notify']:
         rcpts.append(config['also_notify'])
@@ -122,10 +122,10 @@ def quarantine(body_path, control_paths, explanation):
     # Prepare notice for recipients of quarantined message
     # Some sites would prefer that only admins release messages from the
     # quarantine.
-    if('user_release' in config
-       and config['user_release'] == 0
-       and 'also_notify' in config
-       and config['also_notify']):
+    if ('user_release' in config
+        and config['user_release'] == 0
+        and 'also_notify' in config
+        and config['also_notify']):
         release_addr = config['also_notify']
     else:
         release_addr = 'quarantine-%s-%s@%s' % (config['siteid'],
@@ -139,7 +139,7 @@ def quarantine(body_path, control_paths, explanation):
             qmessage = email.message_from_binary_file(body_file)
     except Exception as e:
         # TODO: Handle this error.
-        raise #InitError('Internal failure parsing message data file: %s' % str(e))
+        raise  # InitError('Internal failure parsing message data file: %s' % str(e))
     qmessage_sender = qmessage['from']
     qmessage_subject = qmessage['subject']
     message = """You received a message that was quarantined because:
@@ -188,9 +188,9 @@ def release(requested_id, address):
         send_failure_notice(requested_id, address)
         return
     for x in courier.control.get_control_data(quarantine_paths[1])['r']:
-        if(x[0] == address or
-           x[1] == address or
-           x[1] == '%s%s' % ('rfc822;', address)):
+        if (x[0] == address or
+            x[1] == address or
+            x[1] == '%s%s' % ('rfc822;', address)):
             courier.sendmail.sendmail('', address, open(quarantine_paths[0], 'rb').readlines())
             return
     # If no address matched, alert the user that the request was invalid.
@@ -219,6 +219,7 @@ def purge():
     # Unlock the DB
     _close_db(dbm_file, lock)
 
+
 # Deprecated names preserved for compatibility with older releases
 sendNotice = send_notice
 sendFailureNotice = send_failure_notice

courier/sendmail.py

@@ -19,6 +19,7 @@
 import subprocess
 import courier.config
 
+
 def sendmail(from_addr, to_addrs, msg):
     """Send a message using Courier's sendmail application.
 

filters/pythonfilter/attachments.py

@@ -64,6 +64,7 @@ def check_archive(filename, part):
     os.rmdir(tmp_d)
     return found
 
+
 def do_filter(body_path, control_paths):
     try:
         with open(body_path, 'rb') as body_file:

filters/pythonfilter/auto_whitelist.py

@@ -74,7 +74,7 @@ def check_whitelist(control_paths):
             correspondents = hashlib.md5(recipient.lower().encode())
             correspondents.update(sender.encode())
             cdigest = correspondents.hexdigest()
-            if not cdigest in _whitelist:
+            if cdigest not in _whitelist:
                 found_all = 0
                 break
     finally:

filters/pythonfilter/comeagain.py

@@ -84,7 +84,7 @@ def do_filter(body_path, control_paths):
             correspondents = sender_md5.copy()
             correspondents.update(recipient.encode())
             cdigest = correspondents.hexdigest()
-            if not cdigest in _senders:
+            if cdigest not in _senders:
                 found_all = 0
             _senders[cdigest] = time.time()
     finally:

filters/pythonfilter/deliveredto.py

@@ -44,8 +44,8 @@ def do_filter(body_path, control_paths):
         dparts = dheader.split('@')
         if len(dparts) != 2:
             return ''
-        if(courier.config.is_local(dparts[1]) or
-           courier.config.is_hosteddomain(dparts[1])):
+        if (courier.config.is_local(dparts[1]) or
+            courier.config.is_hosteddomain(dparts[1])):
             return '501 Mail loop - already have my Delivered-To: header.'
     return ''
 

filters/pythonfilter/localsenders.py

@@ -52,8 +52,8 @@ def do_filter(body_path, control_paths):
 
     if sender_info is None:
         return '517 Sender does not exist: %s' % sender
-    if(require_auth and
-       courier.control.get_auth_user(control_paths, body_path) is None):
+    if (require_auth and
+        courier.control.get_auth_user(control_paths, body_path) is None):
         return '517 Policy requires local senders to authenticate.'
     return ''
 

filters/pythonfilter/ratelimit.py

@@ -38,6 +38,7 @@
 # individual address.
 limit_network = False
 
+
 def init_filter():
     courier.config.apply_module_config('ratelimit.py', globals())