Fixed formatting for linting

Author: pikachu0542

conditional/blueprints/attendance.py

@@ -183,7 +183,7 @@ def submit_committee_attendance(user_dict=None):
     f_attendees = post_data['freshmen']
     timestamp = post_data['timestamp']
 
-    log.info('Submit {} Meeting Attendance'.format(committee))
+    log.info(f'Submit {committee} Meeting Attendance')
 
     timestamp = datetime.strptime(timestamp, "%Y-%m-%d")
     meeting = CommitteeMeeting(committee, timestamp, approved)
@@ -193,11 +193,11 @@ def submit_committee_attendance(user_dict=None):
     db.session.refresh(meeting)
 
     for m in m_attendees:
-        log.info('Gave Attendance to {} for {}'.format(m, committee))
+        log.info(f'Gave Attendance to {m} for {committee}')
         db.session.add(MemberCommitteeAttendance(m, meeting.id))
 
     for f in f_attendees:
-        log.info('Gave Attendance to freshman-{} for {}'.format(f, committee))
+        log.info(f'Gave Attendance to freshman-{f} for {committee}')
         db.session.add(FreshmanCommitteeAttendance(f, meeting.id))
 
     db.session.commit()
@@ -228,11 +228,11 @@ def submit_seminar_attendance(user_dict=None):
     db.session.refresh(seminar)
 
     for m in m_attendees:
-        log.info('Gave Attendance to {} for {}'.format(m, seminar_name))
+        log.info(f'Gave Attendance to {m} for {seminar_name}')
         db.session.add(MemberSeminarAttendance(m, seminar.id))
 
     for f in f_attendees:
-        log.info('Gave Attendance to freshman-{} for {}'.format(f, seminar_name))
+        log.info(f'Gave Attendance to freshman-{f} for {seminar_name}')
         db.session.add(FreshmanSeminarAttendance(f, seminar.id))
 
     db.session.commit()
@@ -263,10 +263,7 @@ def submit_house_attendance(user_dict=None):
 
     if "members" in post_data:
         for m in post_data['members']:
-            log.info('Marked {} {} for House Meeting on {}'.format(
-                m['uid'],
-                m['status'],
-                timestamp.strftime("%Y-%m-%d")))
+            log.info(f'Marked {m['uid']} {m['status']} for House Meeting on {timestamp.strftime("%Y-%m-%d")}')
             db.session.add(MemberHouseMeetingAttendance(
                 m['uid'],
                 meeting.id,
@@ -275,10 +272,7 @@ def submit_house_attendance(user_dict=None):
 
     if "freshmen" in post_data:
         for f in post_data['freshmen']:
-            log.info('Marked freshman-{} {} for House Meeting on {}'.format(
-                f['id'],
-                f['status'],
-                timestamp.strftime("%Y-%m-%d")))
+            log.info(f'Marked freshman-{f['id']} {f['status']} for House Meeting on {timestamp.strftime("%Y-%m-%d")}')
             db.session.add(FreshmanHouseMeetingAttendance(
                 f['id'],
                 meeting.id,
@@ -299,7 +293,7 @@ def alter_house_attendance(uid, hid, user_dict=None):
         return "must be evals", 403
 
     if not uid.isdigit():
-        log.info('Mark {} Present for House Meeting ID: {}'.format(uid, hid))
+        log.info(f'Mark {uid} Present for House Meeting ID: {hid}')
         member_meeting = MemberHouseMeetingAttendance.query.filter(
             MemberHouseMeetingAttendance.uid == uid,
             MemberHouseMeetingAttendance.meeting_id == hid
@@ -308,7 +302,7 @@ def alter_house_attendance(uid, hid, user_dict=None):
         db.session.commit()
         return jsonify({"success": True}), 200
 
-    log.info('Mark freshman-{} Present for House Meeting ID: {}'.format(uid, hid))
+    log.info(f'Mark freshman-{uid} Present for House Meeting ID: {hid}')
     freshman_meeting = FreshmanHouseMeetingAttendance.query.filter(
         FreshmanHouseMeetingAttendance.fid == uid,
         FreshmanHouseMeetingAttendance.meeting_id == hid
@@ -333,7 +327,7 @@ def alter_house_excuse(uid, hid, user_dict=None):
     hm_excuse = post_data['excuse']
 
     if not uid.isdigit():
-        log.info('Mark {} as {} for HM ID: {}'.format(uid, hm_status, hid))
+        log.info(f'Mark {uid} as {hm_status} for HM ID: {hid}')
         MemberHouseMeetingAttendance.query.filter(
             MemberHouseMeetingAttendance.uid == uid,
             MemberHouseMeetingAttendance.meeting_id == hid
@@ -342,7 +336,7 @@ def alter_house_excuse(uid, hid, user_dict=None):
             'attendance_status': hm_status
         })
     else:
-        log.info('Mark {} as {} for HM ID: {}'.format(uid, hm_status, hid))
+        log.info(f'Mark {uid} as {hm_status} for HM ID: {hid}')
         FreshmanHouseMeetingAttendance.query.filter(
             FreshmanHouseMeetingAttendance.fid == uid,
             FreshmanHouseMeetingAttendance.meeting_id == hid

conditional/blueprints/co_op.py

@@ -73,7 +73,7 @@ def delete_co_op(uid, user_dict=None):
     if not ldap_is_eval_director(user_dict['account']):
         return "must be eval director", 403
 
-    log.info('Delete {}\'s Co-Op'.format(uid))
+    log.info(f'Delete {uid}\'s Co-Op')
 
     # Remove from corresponding co-op ldap group
     if ldap_is_member_of_group(user_dict['account'], 'fall_coop'):

conditional/blueprints/conditional.py

@@ -52,7 +52,7 @@ def create_conditional(user_dict=None):
     uid = post_data['uid']
     description = post_data['description']
     due_date = datetime.strptime(post_data['dueDate'], "%Y-%m-%d")
-    log.info('Create a new conditional for {}'.format(uid))
+    log.info(f'Create a new conditional for {uid}')
     if post_data['evaluation'] == 'spring':
         current_eval = SpringEval.query.filter(SpringEval.status == "Pending",
                                                SpringEval.uid == uid,
@@ -88,7 +88,7 @@ def conditional_review(user_dict=None):
     cid = post_data['id']
     status = post_data['status']
 
-    log.info('Updated conditional-{} to {}'.format(cid, status))
+    log.info(f'Updated conditional-{cid} to {status}')
     conditional = Conditional.query.filter(Conditional.id == cid)
     cond_obj = conditional.first()
 

conditional/blueprints/housing.py

@@ -75,11 +75,11 @@ def change_queue_state(user_dict=None):
 
     if uid:
         if post_data.get('inQueue', False):
-            log.info('Add {} to Housing Queue'.format(uid))
+            log.info(f'Add {uid} to Housing Queue')
             queue_obj = InHousingQueue(uid=uid)
             db.session.add(queue_obj)
         else:
-            log.info('Remove {} from Housing Queue'.format(uid))
+            log.info(f'Remove {uid} from Housing Queue')
             InHousingQueue.query.filter_by(uid=uid).delete()
 
     db.session.flush()
@@ -107,14 +107,14 @@ def change_room_numbers(rmnumber, user_dict=None):
         if occupant != "":
             account = ldap_get_member(occupant)
             account.roomNumber = rmnumber
-            log.info('{} assigned to room {}'.format(occupant, rmnumber))
+            log.info(f'{occupant} assigned to room {rmnumber}')
             ldap_set_active(account)
-            log.info('{} marked as active because of room assignment'.format(occupant))
+            log.info(f'{occupant} marked as active because of room assignment')
     # Delete any old occupants that are no longer in room.
         for old_occupant in [account for account in current_students
                              if ldap_get_roomnumber(account) == str(rmnumber)
                              and account.uid not in update["occupants"]]:
-            log.info('{} removed from room {}'.format(old_occupant.uid, old_occupant.roomNumber))
+            log.info(f'{old_occupant.uid} removed from room {old_occupant.roomNumber}')
             old_occupant.roomNumber = None
 
     return jsonify({"success": True}), 200
@@ -146,6 +146,6 @@ def clear_all_rooms(user_dict=None):
 
     # Find the current occupants and clear them.
     for occupant in current_students:
-        log.info('{} removed from room {}'.format(occupant.uid, occupant.roomNumber))
+        log.info(f'{occupant.uid} removed from room {occupant.roomNumber}')
         occupant.roomNumber = None
     return jsonify({"success": True}), 200

conditional/blueprints/major_project_submission.py

@@ -148,7 +148,7 @@ def major_project_review(user_dict=None):
     pid = post_data['id']
     status = post_data['status']
 
-    log.info('{} Major Project ID: {}'.format(status, pid))
+    log.info(f'{status} Major Project ID: {pid}')
 
     print(post_data)
     MajorProject.query.filter(
@@ -167,7 +167,7 @@ def major_project_review(user_dict=None):
 @get_user
 def major_project_delete(pid, user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
-    log.info('Delete Major Project ID: {}'.format(pid))
+    log.info(f'Delete Major Project ID: {pid}')
 
     major_project = MajorProject.query.filter(
         MajorProject.id == pid

conditional/blueprints/member_management.py

@@ -111,14 +111,14 @@ def member_management_eval(user_dict=None):
     post_data = request.get_json()
 
     if 'siteLockdown' in post_data:
-        log.info('Changed Site Lockdown: {}'.format(post_data['siteLockdown']))
+        log.info(f'Changed Site Lockdown: {post_data['siteLockdown']}')
         EvalSettings.query.update(
             {
                 'site_lockdown': post_data['siteLockdown']
             })
 
     if 'introForm' in post_data:
-        log.info('Changed Intro Form: {}'.format(post_data['introForm']))
+        log.info(f'Changed Intro Form: {post_data['introForm']}')
         EvalSettings.query.update(
             {
                 'intro_form_active': post_data['introForm']
@@ -142,7 +142,7 @@ def member_management_financial(user_dict=None):
 
     if 'acceptDuesUntil' in post_data:
         date = datetime.strptime(post_data['acceptDuesUntil'], "%Y-%m-%d")
-        log.info('Changed Dues Accepted Until: {}'.format(date))
+        log.info(f'Changed Dues Accepted Until: {date}')
         EvalSettings.query.update(
             {
                 'accept_dues_until': date
@@ -167,7 +167,7 @@ def member_management_adduser(user_dict=None):
     name = post_data['name']
     onfloor_status = post_data['onfloor']
     room_number = post_data['roomNumber']
-    log.info('Create Freshman Account for {}'.format(name))
+    log.info(f'Create Freshman Account for {name}')
 
     # empty room numbers should be NULL
     if room_number == "":
@@ -210,7 +210,7 @@ def member_management_uploaduser(user_dict=None):
             else:
                 rit_username = None
 
-            log.info('Create Freshman Account for {} via CSV Upload'.format(name))
+            log.info(f'Create Freshman Account for {name} via CSV Upload')
             db.session.add(FreshmanAccount(name, onfloor_status, room_number, None, rit_username))
 
         db.session.flush()
@@ -248,11 +248,7 @@ def edit_uid(uid, flask_request, username):
         room_number = post_data['roomNumber']
         onfloor_status = post_data['onfloorStatus']
         housing_points = post_data['housingPoints']
-        log.info('Edit {} - Room: {} On-Floor: {} Points: {}'.format(
-            uid,
-            post_data['roomNumber'],
-            post_data['onfloorStatus'],
-            post_data['housingPoints']))
+        log.info(f'Edit {uid} - Room: {post_data['roomNumber']} On-Floor: {post_data['onfloorStatus']} Points: {post_data['housingPoints']}')
 
         ldap_set_roomnumber(account, room_number)
         if onfloor_status:
@@ -271,7 +267,7 @@ def edit_uid(uid, flask_request, username):
         ldap_set_housingpoints(account, housing_points)
 
     # Only update if there's a diff
-    log.info('Set {} Active: {}'.format(uid, active_member))
+    log.info(f'Set {uid} Active: {active_member}')
     if ldap_is_active(account) != active_member:
         if active_member:
             ldap_set_active(account)
@@ -293,12 +289,7 @@ def edit_uid(uid, flask_request, username):
 def edit_fid(uid, flask_request):
     log = logger.new(request=flask_request, auth_dict={'username': uid})
     post_data = flask_request.get_json()
-    log.info('Edit freshman-{} - Room: {} On-Floor: {} Eval: {} SigMiss: {}'.format(
-        uid,
-        post_data['roomNumber'],
-        post_data['onfloorStatus'],
-        post_data['evalDate'],
-        post_data['sigMissed']))
+    log.info(f'Edit freshman-{uid} - Room: {post_data['roomNumber']} On-Floor: {post_data['onfloorStatus']} Eval: {post_data['evalDate']} SigMiss: {post_data['sigMissed']}')
 
     name = post_data['name']
 
@@ -329,7 +320,7 @@ def edit_fid(uid, flask_request):
 @get_user
 def member_management_getuserinfo(uid, user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
-    log.info('Get {}\'s Information'.format(uid))
+    log.info(f'Get {uid}\'s Information')
 
     if not ldap_is_eval_director(user_dict['account']) and not ldap_is_financial_director(user_dict['account']):
         return "must be eval or financial director", 403
@@ -414,7 +405,7 @@ def get_hm_date(hm_id):
 @get_user
 def member_management_deleteuser(fid, user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
-    log.info('Delete freshman-{}'.format(fid))
+    log.info(f'Delete freshman-{fid}')
 
     if not ldap_is_eval_director(user_dict['account']):
         return "must be eval director", 403
@@ -458,7 +449,7 @@ def member_management_upgrade_user(user_dict=None):
     uid = post_data['uid']
     signatures_missed = post_data['sigsMissed']
 
-    log.info('Upgrade freshman-{} to Account: {}'.format(fid, uid))
+    log.info(f'Upgrade freshman-{fid} to Account: {uid}')
 
     acct = FreshmanAccount.query.filter(
         FreshmanAccount.id == fid).first()
@@ -483,10 +474,7 @@ def member_management_upgrade_user(user_dict=None):
             db.session.add(MemberHouseMeetingAttendance(
                 uid, fhm.meeting_id, fhm.excuse, fhm.attendance_status))
         else:
-            log.info('Duplicate house meeting attendance! fid: {}, uid: {}, id: {}'.format(
-                fid,
-                uid,
-                fhm.meeting_id))
+            log.info(f'Duplicate house meeting attendance! fid: {fid}, uid: {uid}, id: {fhm.meeting_id}')
         db.session.delete(fhm)
 
     new_account = ldap_get_member(uid)
@@ -519,7 +507,7 @@ def member_management_make_user_active(user_dict=None):
         return "must be current student, not in bad standing and not active", 403
 
     ldap_set_active(user_dict['account'])
-    log.info("Make user {} active".format(user_dict['username']))
+    log.info(f"Make user {user_dict['username']} active")
 
     clear_members_cache()
     return jsonify({"success": True}), 200
@@ -530,7 +518,7 @@ def member_management_make_user_active(user_dict=None):
 @get_user
 def get_member(uid, user_dict=None):
     log = logger.new(request=request, auth_dict=user_dict)
-    log.info('Get {}\'s Information'.format(uid))
+    log.info(f'Get {uid}\'s Information')
 
     if not ldap_is_eval_director(user_dict['account']):
         return "must be eval director", 403
@@ -559,7 +547,7 @@ def clear_active_members(user_dict=None):
     # Clear the active group.
     for account in members:
         if account.uid != user_dict['username']:
-            log.info('Remove {} from Active Status'.format(account.uid))
+            log.info(f'Remove {account.uid} from Active Status')
             ldap_set_inactive(account)
     return jsonify({"success": True}), 200
 
@@ -602,10 +590,10 @@ def remove_current_student(uid, user_dict=None):
 
     member = ldap_get_member(uid)
     if request.method == 'DELETE':
-        log.info('Remove {} from Current Student'.format(uid))
+        log.info(f'Remove {uid} from Current Student')
         ldap_set_non_current_student(member)
     elif request.method == 'POST':
-        log.info('Add {} to Current Students'.format(uid))
+        log.info(f'Add {uid} to Current Students')
         ldap_set_current_student(member)
     return jsonify({"success": True}), 200
 

conditional/blueprints/slideshow.py

@@ -61,7 +61,7 @@ def slideshow_intro_review(user_dict=None):
     uid = post_data['uid']
     status = post_data['status']
 
-    log.info('Intro Eval for {}: {}'.format(uid, status))
+    log.info(f'Intro Eval for {uid}: {status}')
     FreshmanEvalData.query.filter(
         FreshmanEvalData.uid == uid and
         FreshmanEvalData.active). \
@@ -117,7 +117,7 @@ def slideshow_spring_review(user_dict=None):
     uid = post_data['uid']
     status = post_data['status']
 
-    log.info('Spring Eval for {}: {}'.format(uid, status))
+    log.info(f'Spring Eval for {uid}: {status}')
 
     SpringEval.query.filter(
         SpringEval.uid == uid and