Reformatting to clear several linter recommendations

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'],
@@ -137,7 +137,7 @@ def quarantine(body_path, control_paths, explanation):
     try:
         with open(body_path, 'rb') as body_file:
             qmessage = email.message_from_binary_file(body_file)
-    except Exception as e:
+    except Exception:
         # TODO: Handle this error.
         raise  # InitError('Internal failure parsing message data file: %s' % str(e))
     qmessage_sender = qmessage['from']
@@ -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.

dropmsg

@@ -36,7 +36,6 @@ def usage():
     -s: Messages with the given envelope sender's address or DSNs to that address''' % quarantine)
 
 
-
 def drop(cf, df):
     qcf = os.path.join(quarantine, os.path.basename(cf))
     qdf = os.path.join(quarantine, os.path.basename(df))
@@ -98,5 +97,6 @@ def main():
 
     search(auth, ip, sender)
 
+
 if __name__ == '__main__':
     main()

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 ''
 

filters/pythonfilter/whitelist_dnswl.py

@@ -52,7 +52,7 @@ def do_filter(body_path, control_paths):
         sys.stderr.write(f'whitelist_dnswl: unparsable senders_ip: {senders_ip}\n')
         return ''
 
-    # sender is either IPV4Address or IPV6Address object, 
+    # sender is either IPV4Address or IPV6Address object
     reverse = sender.reverse_pointer.replace('.in-addr.arpa', '').replace('.ip6.arpa', '')
 
     for zone in dnswl_zone:

pythonfilter

@@ -344,8 +344,10 @@ def log_file_codes(module, reply_code, control_paths):
 
 
 def wait_for_message(filter_socket, filters, active_filters):
-    try: ready_files = select.select([sys.stdin, filter_socket], [], [])
-    except Exception: return True
+    try:
+        ready_files = select.select([sys.stdin, filter_socket], [], [])
+    except Exception:
+        return True
     # If stdin raised an event, it was closed and we need to exit.
     if sys.stdin in ready_files[0]:
         return False
@@ -377,7 +379,7 @@ def close_socket(filter_socket_path, filter_socket):
 
 def wait_for_active_filters(active_filters):
     deadline = time.time() + 10
-    while(active_filters.count > 0 and time.time() < deadline):
+    while (active_filters.count > 0 and time.time() < deadline):
         # Wait for them all to finish
         time.sleep(0.1)
 

tests/test_control.py

@@ -18,16 +18,13 @@
 # along with pythonfilter.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import unittest
 import shutil
-import courier.config
-
-
-courier.config.sysconfdir = 'tmp/configfiles'
-
+import unittest
 
+import courier.config
 import courier.control
 
+courier.config.sysconfdir = 'tmp/configfiles'
 
 message = {}
 message['xalias'] = {'control_paths': [f'{os.path.dirname(__file__)}/tmp/queuefiles/control-xalias'],
@@ -79,7 +76,7 @@
                                                 'rfc822;postmaster@ascension.private.dragonsdawn.net',
                                                 '']]},
                         'senders_ip': '127.0.0.1'}
-message['ldapalias'] = {'control_paths':  [f'{os.path.dirname(__file__)}/tmp/queuefiles/control-ldapalias'],
+message['ldapalias'] = {'control_paths': [f'{os.path.dirname(__file__)}/tmp/queuefiles/control-ldapalias'],
                         'control_data': {'s': 'root@ascension.private.dragonsdawn.net',
                                          'f': 'dns; localhost (localhost [127.0.0.1])',
                                          'e': '',