Fix Build

Author: devinmatte

conditional/blueprints/attendance.py

@@ -525,24 +525,23 @@ def get_cm_attendees(sid, user_dict=None):
             attendees.append(freshman)
         return jsonify({"attendees": attendees}), 200
 
-    else:
-        log = logger.new(request=request, auth_dict=user_dict)
-        log.info('Delete Technical Seminar {}'.format(sid))
+    log = logger.new(request=request, auth_dict=user_dict)
+    log.info('Delete Technical Seminar {}'.format(sid))
 
-        if not ldap_is_eboard(user_dict['account']):
-            return jsonify({"success": False, "error": "Not EBoard"}), 403
+    if not ldap_is_eboard(user_dict['account']):
+        return jsonify({"success": False, "error": "Not EBoard"}), 403
 
-        FreshmanSeminarAttendance.query.filter(
-            FreshmanSeminarAttendance.seminar_id == sid).delete()
-        MemberSeminarAttendance.query.filter(
-            MemberSeminarAttendance.seminar_id == sid).delete()
-        TechnicalSeminar.query.filter(
-            TechnicalSeminar.id == sid).delete()
+    FreshmanSeminarAttendance.query.filter(
+        FreshmanSeminarAttendance.seminar_id == sid).delete()
+    MemberSeminarAttendance.query.filter(
+        MemberSeminarAttendance.seminar_id == sid).delete()
+    TechnicalSeminar.query.filter(
+        TechnicalSeminar.id == sid).delete()
 
-        db.session.flush()
-        db.session.commit()
+    db.session.flush()
+    db.session.commit()
 
-        return jsonify({"success": True}), 200
+    return jsonify({"success": True}), 200
 
 
 @attendance_bp.route('/attendance/cm/<cid>', methods=['GET', 'DELETE'])
@@ -563,24 +562,23 @@ def get_ts_attendees(cid, user_dict=None):
             attendees.append(freshman)
         return jsonify({"attendees": attendees}), 200
 
-    else:
-        log = logger.new(request=request, auth_dict=user_dict)
-        log.info('Delete Committee Meeting {}'.format(cid))
+    log = logger.new(request=request, auth_dict=user_dict)
+    log.info('Delete Committee Meeting {}'.format(cid))
 
-        if not ldap_is_eboard(user_dict['account']):
-            return jsonify({"success": False, "error": "Not EBoard"}), 403
+    if not ldap_is_eboard(user_dict['account']):
+        return jsonify({"success": False, "error": "Not EBoard"}), 403
 
-        FreshmanCommitteeAttendance.query.filter(
-            FreshmanCommitteeAttendance.meeting_id == cid).delete()
-        MemberCommitteeAttendance.query.filter(
-            MemberCommitteeAttendance.meeting_id == cid).delete()
-        CommitteeMeeting.query.filter(
-            CommitteeMeeting.id == cid).delete()
+    FreshmanCommitteeAttendance.query.filter(
+        FreshmanCommitteeAttendance.meeting_id == cid).delete()
+    MemberCommitteeAttendance.query.filter(
+        MemberCommitteeAttendance.meeting_id == cid).delete()
+    CommitteeMeeting.query.filter(
+        CommitteeMeeting.id == cid).delete()
 
-        db.session.flush()
-        db.session.commit()
+    db.session.flush()
+    db.session.commit()
 
-        return jsonify({"success": True}), 200
+    return jsonify({"success": True}), 200
 
 
 @attendance_bp.route('/attendance/cm/<cid>/approve', methods=['POST'])

conditional/config.py

@@ -4,7 +4,7 @@
 from conditional import __version__
 
 # Flask config
-DEBUG = True if env.get("CONDITIONAL_DEBUG", "false").lower() == "true" else False
+DEBUG = env.get("CONDITIONAL_DEBUG", "false").lower() == "true"
 HOST_NAME = env.get("CONDITIONAL_HOST_NAME", "conditional.csh.rit.edu")
 SERVER_NAME = env.get('CONDITIONAL_SERVER_NAME', 'conditional.csh.rit.edu')
 APP_NAME = "conditional"
@@ -15,7 +15,7 @@
 SQLALCHEMY_DATABASE_URI = env.get("SQLALCHEMY_DATABASE_URI", "")
 
 # LDAP config
-LDAP_RO = True if env.get("CONDITIONAL_LDAP_RO", "true").lower() == "true" else False
+LDAP_RO = env.get("CONDITIONAL_LDAP_RO", "true").lower() == "true"
 LDAP_BIND_DN = env.get("CONDITIONAL_LDAP_BIND_DN", "cn=conditional,ou=Apps,dc=csh,dc=rit,dc=edu")
 LDAP_BIND_PW = env.get("CONDITIONAL_LDAP_BIND_PW", "")
 

requirements.txt

@@ -1,5 +1,5 @@
 alembic==0.9.8
-astroid==1.6.1
+astroid==2.2.5
 blinker==1.4
 click==6.7
 csh-ldap==2.0.2
@@ -18,7 +18,7 @@ mccabe==0.6.1
 oic==0.11.0.1
 psycopg2==2.7.4
 pyldap==2.4.45
-pylint==1.8.2
+pylint==2.3.1
 python-dateutil==2.6.1
 python-editor==1.0.3
 raven==6.6.0