Upgrade PyLint and Freeze Dependencies

Author: mbillow

conditional/blueprints/attendance.py

@@ -391,7 +391,7 @@ def get_seminar_attendees(meeting_id):
     user_name = request.headers.get('x-webauth-user')
     account = ldap_get_member(user_name)
     if not ldap_is_eboard(account):
-        return "must be eboard", 403
+        return jsonify({"success": False, "error": "Not EBoard"}), 403
 
 
     page = request.args.get('page', 1)
@@ -455,7 +455,7 @@ def alter_committee_attendance(cid):
 
     account = ldap_get_member(user_name)
     if not ldap_is_eboard(account):
-        return "must be eboard", 403
+        return jsonify({"success": False, "error": "Not EBoard"}), 403
 
     post_data = request.get_json()
     meeting_id = cid
@@ -488,7 +488,7 @@ def alter_seminar_attendance(sid):
 
     account = ldap_get_member(user_name)
     if not ldap_is_eboard(account):
-        return "must be eboard", 403
+        return jsonify({"success": False, "error": "Not EBoard"}), 403
 
     post_data = request.get_json()
     meeting_id = sid
@@ -528,15 +528,15 @@ def get_cm_attendees(sid):
             attendees.append(freshman)
         return jsonify({"attendees": attendees}), 200
 
-    elif request.method == 'DELETE':
+    else:
         log = logger.new(request=request)
         log.info('Delete Technical Seminar {}'.format(sid))
 
         user_name = request.headers.get('x-webauth-user')
 
         account = ldap_get_member(user_name)
         if not ldap_is_eboard(account):
-            return "must be eboard", 403
+            return jsonify({"success": False, "error": "Not EBoard"}), 403
 
         FreshmanSeminarAttendance.query.filter(
             FreshmanSeminarAttendance.seminar_id == sid).delete()
@@ -567,15 +567,15 @@ def get_ts_attendees(cid):
             attendees.append(freshman)
         return jsonify({"attendees": attendees}), 200
 
-    elif request.method == 'DELETE':
+    else:
         log = logger.new(request=request)
         log.info('Delete Committee Meeting {}'.format(cid))
 
         user_name = request.headers.get('x-webauth-user')
 
         account = ldap_get_member(user_name)
         if not ldap_is_eboard(account):
-            return "must be eboard", 403
+            return jsonify({"success": False, "error": "Not EBoard"}), 403
 
         FreshmanCommitteeAttendance.query.filter(
             FreshmanCommitteeAttendance.meeting_id == cid).delete()
@@ -599,7 +599,7 @@ def approve_cm(cid):
 
     account = ldap_get_member(user_name)
     if not ldap_is_eboard(account):
-        return "must be eboard", 403
+        return jsonify({"success": False, "error": "Not EBoard"}), 403
 
     CommitteeMeeting.query.filter(
         CommitteeMeeting.id == cid).first().approved = True
@@ -618,7 +618,7 @@ def approve_ts(sid):
 
     account = ldap_get_member(user_name)
     if not ldap_is_eboard(account):
-        return "must be eboard", 403
+        return jsonify({"success": False, "error": "Not EBoard"}), 403
 
     TechnicalSeminar.query.filter(
         TechnicalSeminar.id == sid).first().approved = True

conditional/blueprints/cache_management.py

@@ -2,6 +2,8 @@
 import signal
 import structlog
 
+from flask import Blueprint, request, redirect
+
 from conditional.util.ldap import ldap_is_eval_director
 from conditional.util.ldap import ldap_is_rtp
 
@@ -17,8 +19,6 @@
 from conditional.util.member import get_onfloor_members
 
 
-from flask import Blueprint, request, redirect
-
 logger = structlog.get_logger()
 cache_bp = Blueprint('cache_bp', __name__)
 

conditional/blueprints/major_project_submission.py

@@ -2,14 +2,15 @@
 
 from flask import Blueprint, request, jsonify, redirect
 
+from sqlalchemy import desc
+
 from conditional.models.models import MajorProject
 
 from conditional.util.ldap import ldap_is_eval_director
 from conditional.util.ldap import ldap_get_member
 from conditional.util.flask import render_template
 
 from conditional import db, start_of_year
-from sqlalchemy import desc
 
 
 logger = structlog.get_logger()

conditional/util/ldap.py

@@ -31,6 +31,7 @@ def _ldap_is_member_of_directorship(account, directorship):
     for director in directors:
         if director.uid == account.uid:
             return True
+    return False
 
 
 @lru_cache(maxsize=1024)

requirements.txt

@@ -1,13 +1,26 @@
-Flask
-itsdangerous
-Jinja2
-MarkupSafe
-csh_ldap
-SQLAlchemy
-Werkzeug
-structlog
-flask_sqlalchemy
-flask_migrate
-pylint
-#psycopg2
-raven[flask]
+alembic==0.9.6
+astroid==1.6.0
+blinker==1.4
+click==6.7
+csh-ldap==1.2.4.dev41
+Flask==0.12.2
+Flask-Migrate==2.1.1
+Flask-SQLAlchemy==2.3.2
+isort==4.2.15
+itsdangerous==0.24
+Jinja2==2.9.6
+lazy-object-proxy==1.3.1
+Mako==1.0.7
+MarkupSafe==1.0
+mccabe==0.6.1
+psycopg2==2.7.3.2
+pyldap==2.4.37
+pylint==1.8.1
+python-dateutil==2.6.1
+python-editor==1.0.3
+raven==6.3.0
+six==1.11.0
+SQLAlchemy==1.1.15
+structlog==17.2.0
+Werkzeug==0.12.2
+wrapt==1.10.11