fix linting :)

Author: BigSpaceships

conditional/blueprints/attendance.py

@@ -21,7 +21,6 @@
 from conditional.util.ldap import ldap_get_current_students
 from conditional.util.ldap import ldap_get_member
 from conditional.util.ldap import ldap_is_eboard
-from conditional.util.ldap import ldap_is_eval_director
 from conditional.util.user_dict import user_dict_is_eboard, user_dict_is_eval_director
 
 logger = structlog.get_logger()

conditional/blueprints/cache_management.py

@@ -1,7 +1,6 @@
 import os
 import signal
 
-from conditional.util.user_dict import user_dict_is_eval_director, user_dict_is_rtp
 import structlog
 from flask import Blueprint, request, redirect
 
@@ -14,8 +13,7 @@
 from conditional.util.ldap import ldap_get_intro_members
 from conditional.util.ldap import ldap_get_member
 from conditional.util.ldap import ldap_get_onfloor_members
-from conditional.util.ldap import ldap_is_eval_director
-from conditional.util.ldap import ldap_is_rtp
+from conditional.util.user_dict import user_dict_is_eval_director, user_dict_is_rtp
 
 logger = structlog.get_logger()
 cache_bp = Blueprint('cache_bp', __name__)

conditional/blueprints/co_op.py

@@ -1,4 +1,3 @@
-from conditional.util.user_dict import user_dict_is_current_student, user_dict_is_eval_director, user_dict_is_in_group
 import structlog
 from flask import Blueprint, request, jsonify
 
@@ -7,10 +6,9 @@
 from conditional.util.member import req_cm
 from conditional.util.auth import get_user
 from conditional.util.flask import render_template
-from conditional.util.ldap import ldap_is_eval_director, ldap_is_current_student
 from conditional.util.ldap import _ldap_add_member_to_group as ldap_add_member_to_group
 from conditional.util.ldap import _ldap_remove_member_from_group as ldap_remove_member_from_group
-from conditional.util.ldap import _ldap_is_member_of_group as ldap_is_member_of_group
+from conditional.util.user_dict import user_dict_is_current_student, user_dict_is_eval_director, user_dict_is_in_group
 
 co_op_bp = Blueprint('co_op_bp', __name__)
 

conditional/blueprints/conditional.py

@@ -1,14 +1,13 @@
 from datetime import datetime
 
-from conditional.util.user_dict import user_dict_is_eval_director
 import structlog
 from flask import Blueprint, request, jsonify, redirect
 
 from conditional import db, auth
 from conditional.models.models import Conditional, SpringEval, FreshmanEvalData
 from conditional.util.auth import get_user
 from conditional.util.flask import render_template
-from conditional.util.ldap import ldap_is_eval_director
+from conditional.util.user_dict import user_dict_is_eval_director
 
 conditionals_bp = Blueprint('conditionals_bp', __name__)
 

conditional/blueprints/dashboard.py

@@ -1,4 +1,3 @@
-from conditional.util.user_dict import user_dict_is_active, user_dict_is_bad_standing, user_dict_is_intromember, user_dict_is_onfloor
 import structlog
 from flask import Blueprint, request
 
@@ -13,11 +12,9 @@
 from conditional.util.auth import get_user
 from conditional.util.flask import render_template
 from conditional.util.housing import get_queue_position
-from conditional.util.ldap import ldap_get_active_members, ldap_is_bad_standing
-from conditional.util.ldap import ldap_is_active
-from conditional.util.ldap import ldap_is_intromember
-from conditional.util.ldap import ldap_is_onfloor
 from conditional.util.member import get_active_members, get_freshman_data, get_voting_members, get_cm, get_hm, req_cm
+from conditional.util.user_dict import user_dict_is_active, user_dict_is_bad_standing, user_dict_is_intromember, \
+    user_dict_is_onfloor
 
 logger = structlog.get_logger()
 

conditional/blueprints/logs.py

@@ -1,13 +1,11 @@
-from conditional.util.user_dict import user_dict_is_eboard, user_dict_is_rtp
 import structlog
 from flask import Blueprint, request
 
 from conditional import auth
 from conditional.models.models import UserLog
 from conditional.util.auth import get_user
 from conditional.util.flask import render_template
-from conditional.util.ldap import ldap_is_eboard
-from conditional.util.ldap import ldap_is_rtp
+from conditional.util.user_dict import user_dict_is_eboard, user_dict_is_rtp
 
 logger = structlog.get_logger()
 

conditional/blueprints/member_management.py

@@ -24,11 +24,9 @@
 
 from conditional.blueprints.cache_management import clear_members_cache
 
-from conditional.util.ldap import ldap_is_eval_director, ldap_is_bad_standing
-from conditional.util.ldap import ldap_is_financial_director
+from conditional.util.ldap import ldap_is_eval_director
 from conditional.util.ldap import ldap_is_active
 from conditional.util.ldap import ldap_is_onfloor
-from conditional.util.ldap import ldap_is_current_student
 from conditional.util.ldap import ldap_set_roomnumber
 from conditional.util.ldap import ldap_set_active
 from conditional.util.ldap import ldap_set_inactive
@@ -46,7 +44,8 @@
 
 from conditional.util.flask import render_template
 from conditional.models.models import attendance_enum
-from conditional.util.user_dict import user_dict_is_active, user_dict_is_bad_standing, user_dict_is_current_student, user_dict_is_eval_director, user_dict_is_financial_director
+from conditional.util.user_dict import user_dict_is_active, user_dict_is_bad_standing, user_dict_is_current_student, \
+    user_dict_is_eval_director, user_dict_is_financial_director
 
 logger = structlog.get_logger()
 

conditional/blueprints/slideshow.py

@@ -11,7 +11,7 @@
 from conditional.models.models import SpringEval
 from conditional.util.auth import get_user
 from conditional.util.flask import render_template
-from conditional.util.ldap import ldap_is_eval_director, ldap_is_intromember, ldap_set_failed, ldap_set_bad_standing, \
+from conditional.util.ldap import ldap_is_intromember, ldap_set_failed, ldap_set_bad_standing, \
     ldap_set_inactive, ldap_get_member, ldap_set_not_intro_member
 from conditional.util.user_dict import user_dict_is_eval_director
 

conditional/util/flask.py

@@ -4,19 +4,12 @@
 from conditional.models.models import EvalSettings
 from conditional.util.auth import get_user
 
-from conditional.util.ldap import ldap_is_active
-from conditional.util.ldap import ldap_is_alumni
-from conditional.util.ldap import ldap_is_eboard
-from conditional.util.ldap import ldap_is_financial_director
-from conditional.util.ldap import ldap_is_eval_director
-from conditional.util.ldap import ldap_is_intromember
-from conditional.util.ldap import ldap_is_rtp
-
 from conditional.models.models import CommitteeMeeting
 from conditional.models.models import TechnicalSeminar
 
 from conditional import db
-from conditional.util.user_dict import user_dict_is_active, user_dict_is_alumni, user_dict_is_eboard, user_dict_is_eval_director, user_dict_is_financial_director, user_dict_is_intromember, user_dict_is_rtp
+from conditional.util.user_dict import user_dict_is_active, user_dict_is_alumni, user_dict_is_eboard, \
+    user_dict_is_eval_director, user_dict_is_financial_director, user_dict_is_intromember, user_dict_is_rtp
 
 
 @get_user

conditional/util/member.py

@@ -1,5 +1,4 @@
 from datetime import datetime
-from sys import maxsize
 from sqlalchemy import func, or_
 
 from conditional import start_of_year
@@ -16,7 +15,6 @@
 from conditional.util.ldap import ldap_get_current_students
 from conditional.util.ldap import ldap_get_intro_members
 from conditional.util.ldap import ldap_get_onfloor_members
-from conditional.util.ldap import ldap_get_roomnumber
 from conditional.util.ldap import ldap_is_active
 from conditional.util.ldap import ldap_is_intromember
 from conditional.util.ldap import ldap_get_member
@@ -43,7 +41,7 @@ def get_members_info_active_and_onfloor():
         if onfloor:
             onfloor_set.add(uid)
 
-        room = ldap_get_roomnumber(account)
+        room = account.roomNumber
         hp = account.housingPoints
         member_list.append({
             "uid": uid,
@@ -106,7 +104,7 @@ def get_all_onfloor_members() -> set[str]:
     return {members.uid for members in ldap_get_onfloor_members()}
 
 @service_cache(maxsize=1024)
-def get_onfloor_members():
+def get_onfloor_members() -> set[str]:
     return get_active_members() & get_all_onfloor_members()
 
 def get_cm(member):