Skip to content

Commit 1c549c8

Browse files
committed
fix linting
1 parent 764af0f commit 1c549c8

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

conditional/util/housing.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def get_housing_queue(is_eval_director=False):
1818
OnFloorStatusAssigned,
1919
OnFloorStatusAssigned.uid == InHousingQueue.uid
2020
).with_entities(
21-
InHousingQueue.uid,
21+
InHousingQueue.uid,
2222
OnFloorStatusAssigned.onfloor_granted
2323
).all()
2424
}
@@ -28,7 +28,7 @@ def get_housing_queue(is_eval_director=False):
2828

2929
# Populate a list of dictionaries containing the name, username,
3030
# and on-floor datetime for each current studetn who has on-floor status
31-
# and is not already assigned to a room
31+
# and is not already assigned to a room
3232
queue = [
3333
{
3434
"uid": account.uid,

conditional/util/ldap.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1+
from csh_ldap import CSHMember
2+
13
from conditional import ldap
24
from conditional.util.cache import service_cache
35

4-
from csh_ldap import CSHGroup, CSHMember
5-
6-
76
def _ldap_get_group_members(group: str) -> list[CSHMember]:
87
return ldap.get_group(group).get_members()
98

conditional/util/member.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ def get_voting_memberse():
158158
).scalar()
159159

160160
# have to do this because if it's none then set constructor screams
161-
if coop_members == None:
161+
if coop_members is None:
162162
coop_members = set()
163-
else:
163+
else:
164164
coop_members = set(coop_members)
165165

166166
passed_fall_members = FreshmanEvalData.query.filter(
@@ -170,7 +170,7 @@ def get_voting_memberse():
170170
func.array_agg(FreshmanEvalData.uid)
171171
).scalar()
172172

173-
if (passed_fall_members == None):
173+
if passed_fall_members is None:
174174
passed_fall_members = set()
175175
else:
176176
passed_fall_members = set(passed_fall_members)
@@ -195,7 +195,7 @@ def get_voting_memberse():
195195
).group_by(
196196
MemberCommitteeAttendance.uid
197197
).having(
198-
func.count(MemberCommitteeAttendance.uid) >= 6
198+
func.count(MemberCommitteeAttendance.uid) >= 6 #pylint: disable=not-callable
199199
).with_entities(
200200
MemberCommitteeAttendance.uid
201201
).all())
@@ -211,7 +211,7 @@ def get_voting_memberse():
211211
).group_by(
212212
MemberSeminarAttendance.uid
213213
).having(
214-
func.count(MemberSeminarAttendance.uid) >= 2
214+
func.count(MemberSeminarAttendance.uid) >= 2 #pylint: disable=not-callable
215215
).all())
216216

217217
passing_hm = set(member.uid for member in MemberHouseMeetingAttendance.query.join(
@@ -227,7 +227,7 @@ def get_voting_memberse():
227227
).group_by(
228228
MemberHouseMeetingAttendance.uid
229229
).having(
230-
func.count(MemberHouseMeetingAttendance.uid) >= 6
230+
func.count(MemberHouseMeetingAttendance.uid) >= 6 #pylint: disable=not-callable
231231
).all())
232232

233233
passing_reqs = passing_dm & passing_ts & passing_hm

0 commit comments

Comments
 (0)