Make Pylint passing

Author: Nil-32-0

conditional/blueprints/attendance.py

@@ -399,7 +399,7 @@ def get_seminar_hosts(meeting_id):
         hosts = [ldap_get_member(a.uid).displayName for a in
                  MemberSeminarHost.query.filter(
                  MemberSeminarHost.seminar_id == meeting_id).all()]
-        
+
         for freshman in [a.fid for a in
                          FreshmanSeminarHost.query.filter(
                          FreshmanSeminarHost.seminar_id == meeting_id).all()]:
@@ -572,7 +572,7 @@ def get_cm_attendees(sid, user_dict=None):
                          } for a in FreshmanSeminarAttendance.query.filter(
                          FreshmanSeminarAttendance.seminar_id == sid).all()]:
             attendees.append(freshman)
-        
+
         for freshman in [{"value": a.fid,
                           "display": FreshmanAccount.query.filter(FreshmanAccount.id == a.fid).first().name
                          } for a in FreshmanSeminarHost.query.filter(

conditional/blueprints/dashboard.py

@@ -108,7 +108,7 @@ def display_dashboard(user_dict=None):
                   ) if is_seminar_attendance_valid(s)]
     data['ts_total'] = len(t_seminars)
     # technical seminars hosted
-    t_seminars_hosted = [s.seminar_id for s in 
+    t_seminars_hosted = [s.seminar_id for s in
                          MemberSeminarHost.query.filter(
                             MemberSeminarHost.uid == uid,
                          ) if is_seminar_attendance_valid(s)]

conditional/blueprints/gatekeep.py

@@ -112,7 +112,8 @@ def display_spring_evals(internal=False, user_dict=None):
         ts_attended_count = ts_count.get(uid, 0)
         ts_hosted_count = ts_host_count.get(uid, 0)
 
-        passing = len(member_missed_hms) <= 1 and cm_attended_count >= 6 and (ts_attended_count >= 2 or ts_hosted_count >= 1)
+        ts_passing = ts_attended_count >= 2 or ts_hosted_count >= 1
+        passing = len(member_missed_hms) <= 1 and cm_attended_count >= 6 and ts_passing
 
         status = 'disenfranchised'
 

conditional/blueprints/intro_evals.py

@@ -231,11 +231,11 @@ def display_intro_evals(internal=False, user_dict=None):
             account_ts_attendance_dict[row[0]] = []
 
         account_ts_attendance_dict[row[0]].append(row[1])
-    
+
     for row in account_ts_hosted_query:
         if not row[0] in account_ts_hosted_dict:
             account_ts_hosted_dict[row[0]] = []
-        
+
         account_ts_hosted_dict[row[0]].append(row[1])
 
     # freshmen who have accounts

conditional/blueprints/member_management.py

@@ -469,7 +469,7 @@ def member_management_upgrade_user(user_dict=None):
 
     for fts in FreshmanSeminarAttendance.query.filter(FreshmanSeminarAttendance.fid == fid):
         db.session.add(MemberSeminarAttendance(uid, fts.seminar_id))
-    
+
     for ftsh in FreshmanSeminarHost.query.filter(FreshmanSeminarHost.fid == fid):
         db.session.add(MemberSeminarHost(uid, ftsh.seminar_id))
 

conditional/models/models.py

@@ -122,7 +122,7 @@ class FreshmanSeminarHost(db.Model):
     id = Column(Integer, primary_key=True)
     fid = Column(ForeignKey('freshman_accounts.id', ondelete="cascade"), nullable=False, index=True)
     seminar_id = Column(ForeignKey('technical_seminars.id'), nullable=False)
-    
+
     def __init__(self, fid, seminar_id):
         self.fid = fid
         self.seminar_id = seminar_id

conditional/util/member.py

@@ -77,7 +77,7 @@ def get_freshman_data(user_name):
             TechnicalSeminar.id == s.seminar_id).first().approved]
     freshman['ts_total'] = len(t_seminars)
     # technical seminars hosted
-    t_seminars_hosted = [s.seminar_id for s in 
+    t_seminars_hosted = [s.seminar_id for s in
                          MemberSeminarHost.query.filter(
                             MemberSeminarHost.uid == user_name
                          ) if TechnicalSeminar.query.filter(
@@ -288,7 +288,7 @@ def get_voting_members():
     ).group_by(
         MemberSeminarHost.uid
     ).having(
-        func.count(MemberSeminarHost.uid) >= 1
+        func.count(MemberSeminarHost.uid) >= 1  # pylint: disable=not-callable
     ).all())
 
     absent_hm = set(member.uid for member in MemberHouseMeetingAttendance.query.join(
@@ -404,7 +404,8 @@ def gatekeep_values(username):
         .count()
     )
 
-    result = eligibility_of_groups and (d_meetings >= 6 and (t_seminars >= 2 or t_seminars_hosted >= 1) and h_meetings_missed < 2) # pylint: disable=chained-comparison
+    ts_passed = t_seminars >= 2 or t_seminars_hosted >= 1
+    result = eligibility_of_groups and (d_meetings >= 6 and ts_passed and h_meetings_missed < 2) # pylint: disable=chained-comparison
 
     return {
         "result": result,