pycodestyle

Author: mikeseibel

endorsement/management/commands/restore_access_rights.py

@@ -37,7 +37,6 @@ def add_arguments(self, parser):
             type=str,
             help='CSV of accessor netid, accessor name, access right')
 
-
     def handle(self, *args, **options):
         self.commit_changes = options['commit']
         netid = options['netid']
@@ -50,7 +49,6 @@ def handle(self, *args, **options):
         except Exception as ex:
             logger.error("restore_access_rights: Exception: {}".format(ex))
 
-
     def restore_netid_access(self, netid):
         accessee = get_accessee_model(netid)
         for delegate, right in self.get_delegates_for_netid(netid).items():
@@ -74,21 +72,22 @@ def get_delegates_for_netid(self, netid):
                 user = delegations['User']
                 if not user:
                     continue
-    
+
                 rights = delegations['AccessRights']
                 delegates[user] = rights
             elif isinstance(delegations, list):
                 for d in delegations:
                     user = d['User']
                     if not user:
                         continue
-    
+
                     rights = d['AccessRights']
                     if isinstance(rights, list):
                         if len(rights) == 1:
                             delegates[user] = rights[0]
                         else:
-                            raise Exception(f"multiple rights for {user}: {rights}")
+                            raise Exception(f"multiple rights for "
+                                            f"{user}: {rights}")
                     elif isinstance(rights, str):
                         delegates[user] = rights
                     else:
@@ -121,8 +120,8 @@ def fix_access_record(self, accessee, delegate, right):
                 f"{'' if self.commit_changes else 'WOULD '}ASSIGN: "
                 f"mailbox {ar.accessee.netid} "
                 f"delegate {ar.accessor.name} "
-                f"right '{ar.access_right.display_name if (self.commit_changes) else rr.display_name}'")
-
+                f"right '{ar.access_right.display_name if (
+                     self.commit_changes) else rr.display_name}'")
 
     def reconcile_csv_access(self, csv_file):
         delegations = {}
@@ -132,11 +131,11 @@ def reconcile_csv_access(self, csv_file):
                 delegates = json.loads(line[1])
                 if not delegates or delegates == 'null':
                     continue
-    
+
                 netid = line[0]
                 if netid not in delegations:
                     delegations[netid] = {}
-    
+
                 if isinstance(delegates, dict):
                     user = delegates['User']
                     right = delegates['AccessRights']
@@ -146,15 +145,15 @@ def reconcile_csv_access(self, csv_file):
                         user = d['User']
                         right = d['AccessRights']
                         delegations[netid][user] = right
-    
+
         with open('/tmp/blanks_remaining.csv', 'r') as f:
             blank_reader = csv.reader(f)
             for i, line in enumerate(blank_reader):
                 netid = line[0]
                 if netid not in delegations:
                     logger.info(f"mailbox {netid} has no delegates")
                     continue
-    
+
                 try:
                     accessee = get_accessee_model(netid)
                 except UnrecognizedUWNetid:
@@ -163,7 +162,7 @@ def reconcile_csv_access(self, csv_file):
                 except Exception as ex:
                     logger.info(f"ERROR: get accessee {netid}: {ex}")
                     continue
-    
+
                 for delegate, right in delegations[netid].items():
                     try:
                         fix_access_record(accessee, delegate, right)

endorsement/reconcile_access.py

@@ -120,11 +120,11 @@ def reconcile_access(commit_changes=False):
             if commit_changes:
                 assign_delegation(accessee, record)
             else:
-                logger.info(("MISSING DELEGATION: mailbox {} delegation {} ({})"
-                             " on {} not assigned in Outlook").format(
-                                 accessee.netid, record.accessor.name,
-                                 record.access_right.name,
-                                 record.datetime_granted))
+                logger.info(f"MISSING DELEGATION: mailbox {accessee.netid} "
+                            f"delegation {record.accessor.name} "
+                            f"({record.access_right.name})"
+                            f" on {record.datetime_granted} not "
+                            "assigned in Outlook")
 
 
 def get_access_right(right):
@@ -145,8 +145,8 @@ def new_access_record(accessee, delegate, right):
         store_access_record(
             accessee, accessor, right, is_reconcile=True)
 
-        logger.info("mailbox {} delegation {} ({}) record created".format(
-            accessee.netid, delegate, right))
+        logger.info(f"mailbox {accessee.netid} delegation {delegate} "
+                    f"({right}) record created")
     except (UnrecognizedUWNetid, UnrecognizedGroupID):
         logger.error(
             "Unknown netid or group: {}".format(delegate))
@@ -160,12 +160,13 @@ def assign_delegation(accessee, record):
     try:
         set_delegate(accessee.netid, record.accessor.name,
                      record.access_right.name)
-        logger.info("mailbox {} delegation {} ({}) assigned".format(
-            accessee.netid, record.accessor.name, record.access_right.name))
+        logger.info(f"mailbox {accessee.netid} delegation "
+                    f"{record.accessor.name} "
+                    f"({record.access_right.name}) assigned")
     except Exception as ex:
-        logger.error("set delegate {} ({}) on {} failed: {}".format(
-            record.accessor.name, record.access_right.name,
-            accessee.netid, ex))
+        logger.error("set delegate {record.accessor.name} "
+                     f"({record.access_right.name}) on "
+                     f"{accessee.netid} failed: {ex}")
 
 
 def revoke_record(record):