Enforce formatting in mig/lib and tests/ directories.

Author: albu-diku

Makefile

@@ -6,11 +6,10 @@ ifndef PY
 	PY = 3
 endif
 
-FORMAT_ENFORCE_DIRS = state/
-FORMAT_EXCLUDE_REGEX = '.*'
-FORMAT_EXCLUDE_GLOB = '*'
+FORMAT_ENFORCE_DIRS = ./mig/lib ./tests
+FORMAT_EXCLUDE_REGEX = '.git|tests/data/|tests/fixture/'
+FORMAT_EXCLUDE_GLOB = '.git/* tests/data/* tests/fixture/*'
 FORMAT_LINE_LENGTH = 80
-
 LOCAL_PYTHON_BIN = './envhelp/lpython'
 
 ifdef PYTHON_BIN

mig/lib/accounting.py

@@ -433,8 +433,7 @@ def run_cron_command(
         _restore_env(saved_environ, os.environ)
         raise exc
     logger.info(
-        "(%s) done running command for %s: %s" % (
-            pid, target_path, command_str)
+        "(%s) done running command for %s: %s" % (pid, target_path, command_str)
     )
 
     # logger.debug('(%s) raw output is: %s' % (pid, output_objects))
@@ -532,8 +531,7 @@ def run_events_command(
         _restore_env(saved_environ, os.environ)
         raise exc
     logger.info(
-        "(%s) done running command for %s: %s" % (
-            pid, target_path, command_str)
+        "(%s) done running command for %s: %s" % (pid, target_path, command_str)
     )
 
     # logger.debug('(%s) raw output is: %s' % (pid, output_objects))

mig/lib/events.py

@@ -36,8 +36,11 @@
 import os
 import time
 
-from mig.shared.accountreq import accept_account_req, existing_user_collision, \
-    reject_account_req
+from mig.shared.accountreq import (
+    accept_account_req,
+    existing_user_collision,
+    reject_account_req,
+)
 from mig.shared.base import get_user_id
 from mig.shared.fileio import delete_file, listdir
 from mig.shared.pwcrypto import verify_reset_token
@@ -274,7 +277,7 @@ def manage_single_req(configuration, req_id, req_path, db_path, now):
         _logger.info("%r made an invalid account request" % client_id)
         # NOTE: 'invalid' is a list of validation error strings if set
         reason = "invalid request: %s." % ". ".join(req_invalid)
-        (rej_status, rej_err) = reject_account_req(
+        rej_status, rej_err = reject_account_req(
             req_id,
             configuration,
             reason,
@@ -284,21 +287,27 @@ def manage_single_req(configuration, req_id, req_path, db_path, now):
         )
         if not rej_status:
             _logger.warning(
-                "failed to reject invalid %r account request: %s" % (client_id,
-                                                                     rej_err)
+                "failed to reject invalid %r account request: %s"
+                % (client_id, rej_err)
             )
         else:
             _logger.info("rejected invalid %r account request" % client_id)
     elif authorized:
-        _logger.info("%r requested renew and authorized password change" %
-                     client_id)
+        _logger.info(
+            "%r requested renew and authorized password change" % client_id
+        )
         peer_id = user_dict.get("peers", [None])[0]
         # NOTE: let authorized reqs (with valid peer) renew even with pw change
         default_renew = True
-        if accept_account_req(req_id, configuration, peer_id,
-                              user_copy=user_copy, admin_copy=admin_copy,
-                              auth_type=auth_type,
-                              default_renew=default_renew):
+        if accept_account_req(
+            req_id,
+            configuration,
+            peer_id,
+            user_copy=user_copy,
+            admin_copy=admin_copy,
+            auth_type=auth_type,
+            default_renew=default_renew,
+        ):
             _logger.info("accepted authorized %r access renew" % client_id)
         else:
             _logger.warning("failed authorized %r access renew" % client_id)
@@ -313,7 +322,7 @@ def manage_single_req(configuration, req_id, req_path, db_path, now):
                 "%r requested and authorized password reset" % client_id
             )
             peer_id = user_dict.get("peers", [None])[0]
-            (acc_status, acc_err) = accept_account_req(
+            acc_status, acc_err = accept_account_req(
                 req_id,
                 configuration,
                 peer_id,
@@ -324,18 +333,18 @@ def manage_single_req(configuration, req_id, req_path, db_path, now):
             )
             if not acc_status:
                 _logger.warning(
-                    "failed to accept %r password reset: %s" % (client_id,
-                                                                acc_err)
+                    "failed to accept %r password reset: %s"
+                    % (client_id, acc_err)
                 )
             else:
                 _logger.info("accepted %r password reset" % client_id)
         else:
             _logger.warning(
-                "%r requested password reset with bad token: %s" % (
-                    client_id, reset_token)
+                "%r requested password reset with bad token: %s"
+                % (client_id, reset_token)
             )
             reason = "invalid password reset token"
-            (rej_status, rej_err) = reject_account_req(
+            rej_status, rej_err = reject_account_req(
                 req_id,
                 configuration,
                 reason,
@@ -345,16 +354,16 @@ def manage_single_req(configuration, req_id, req_path, db_path, now):
             )
             if not rej_status:
                 _logger.warning(
-                    "failed to reject %r password reset: %s" % (client_id,
-                                                                rej_err)
+                    "failed to reject %r password reset: %s"
+                    % (client_id, rej_err)
                 )
             else:
                 _logger.info("rejected %r password reset" % client_id)
     elif req_expire < now:
         #  NOTE: probably should no longer happen after initial auto clean
         _logger.warning("%r request is now past expire" % client_id)
         reason = "expired request - please re-request if still relevant"
-        (rej_status, rej_err) = reject_account_req(
+        rej_status, rej_err = reject_account_req(
             req_id,
             configuration,
             reason,
@@ -363,15 +372,15 @@ def manage_single_req(configuration, req_id, req_path, db_path, now):
             auth_type=auth_type,
         )
         if not rej_status:
-            _logger.warning("failed to reject expired %r request: %s" %
-                            (client_id, rej_err)
-                            )
+            _logger.warning(
+                "failed to reject expired %r request: %s" % (client_id, rej_err)
+            )
         else:
             _logger.info("rejected %r request now past expire" % client_id)
     elif existing_user_collision(configuration, req_dict, client_id):
         _logger.warning("ID collision in request from %r" % client_id)
         reason = "ID collision - please re-request with *existing* ID fields"
-        (rej_status, rej_err) = reject_account_req(
+        rej_status, rej_err = reject_account_req(
             req_id,
             configuration,
             reason,
@@ -381,8 +390,8 @@ def manage_single_req(configuration, req_id, req_path, db_path, now):
         )
         if not rej_status:
             _logger.warning(
-                "failed to reject %r request with ID collision: %s" %
-                (client_id, rej_err)
+                "failed to reject %r request with ID collision: %s"
+                % (client_id, rej_err)
             )
         else:
             _logger.info("rejected %r request with ID collision" % client_id)
@@ -417,8 +426,7 @@ def manage_trivial_user_requests(configuration, now=None):
             continue
         req_id = filename
         req_path = os.path.join(configuration.user_pending, req_id)
-        _logger.debug("checking if account request in %r is trivial" %
-                      req_path)
+        _logger.debug("checking if account request in %r is trivial" % req_path)
         req_age = now - os.path.getmtime(req_path)
         req_age_minutes = req_age / SECS_PER_MINUTE
         if req_age_minutes > MANAGE_TRIVIAL_REQ_MINUTES:
@@ -428,8 +436,7 @@ def manage_trivial_user_requests(configuration, now=None):
             )
             manage_single_req(configuration, req_id, req_path, db_path, now)
             handled += 1
-    _logger.debug("handled %d trivial user account request action(s)" %
-                  handled)
+    _logger.debug("handled %d trivial user account request action(s)" % handled)
     return handled
 
 
@@ -474,7 +481,7 @@ def remind_and_expire_user_pending(configuration, now=None):
             )
             user_copy = True
             admin_copy = True
-            (rej_status, rej_err) = reject_account_req(
+            rej_status, rej_err = reject_account_req(
                 req_id,
                 configuration,
                 reason,
@@ -483,11 +490,12 @@ def remind_and_expire_user_pending(configuration, now=None):
                 auth_type=auth_type,
             )
             if not rej_status:
-                _logger.warning("failed to expire %s request from %r: %s" %
-                                (req_id, client_id, rej_err))
+                _logger.warning(
+                    "failed to expire %s request from %r: %s"
+                    % (req_id, client_id, rej_err)
+                )
             else:
-                _logger.info("expired %s request from %r" % (req_id,
-                                                             client_id))
+                _logger.info("expired %s request from %r" % (req_id, client_id))
             handled += 1
     _logger.debug("handled %d user account request action(s)" % handled)
     return handled