Fix indents of multiline if that are confusable with next block

This resolves pycodestyle warnings of the form:
"E129 visually indented line with same indent as next logical line"

Author: hannob

courier/control.py

@@ -280,7 +280,7 @@ def del_recipient(control_paths, recipient):
         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):
+                    and rcpt[2][0] == recipient):
                 _mark_complete(control_path, rcpt[0])
                 return
 
@@ -306,7 +306,7 @@ def del_recipient_data(control_paths, recipient_data):
         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):
+                    and x[2] == recipient_data):
                 _mark_complete(cf, x[0])
                 return
 

courier/quarantine.py

@@ -73,7 +73,7 @@ def send_notice(message, address, sender=None):
     # available, or if it is present and a true value.
     rcpts = []
     if ('notify_recipient' not in config
-        or config['notify_recipient']):
+            or config['notify_recipient']):
         rcpts.append(address)
     if 'also_notify' in config and config['also_notify']:
         rcpts.append(config['also_notify'])
@@ -123,9 +123,9 @@ def quarantine(body_path, control_paths, explanation):
     # 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']):
+            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'],
@@ -189,8 +189,8 @@ def release(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)):
+                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.

filters/pythonfilter/deliveredto.py

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

filters/pythonfilter/localsenders.py

@@ -53,7 +53,7 @@ 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):
+            courier.control.get_auth_user(control_paths, body_path) is None):
         return '517 Policy requires local senders to authenticate.'
     return ''