Skip to content

Commit 6f3ece8

Browse files
committed
Fixed more linter issues
Part of doing this was that I removed 'bad-continuation' from the disable list in the .pylintrc bc the linting action said that option has been removed from pylint. I left it commented out for now to make sure the lint passes, but I can delete it entirely before this pr is merged assuming this fix passes the check
1 parent 9056f40 commit 6f3ece8

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

.pylintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ disable =
99
duplicate-code,
1010
no-member,
1111
parse-error,
12-
bad-continuation,
1312
too-few-public-methods,
1413
global-statement,
1514
cyclic-import,
1615
locally-disabled,
1716
file-ignored
17+
# bad-continuation,
1818

1919
[REPORTS]
2020
output-format = text

conditional/blueprints/member_management.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import csv
22
import io
33
from datetime import datetime
4-
from distutils.util import strtobool # pylint: disable=no-name-in-module,import-error
4+
from distutils.util import strtobool # pylint: disable=no-name-in-module,import-error,deprecated-module
55

66
import structlog
77
from flask import Blueprint, request, jsonify, make_response
@@ -248,7 +248,7 @@ def edit_uid(uid, flask_request, username):
248248
room_number = post_data['roomNumber']
249249
onfloor_status = post_data['onfloorStatus']
250250
housing_points = post_data['housingPoints']
251-
log.info(f'Edit {uid} - Room: {post_data['roomNumber']} On-Floor: {post_data['onfloorStatus']} Points: {post_data['housingPoints']}')
251+
log.info(f'Edit {uid} - Room: {post_data['roomNumber']} On-Floor: {post_data['onfloorStatus']} Points: {post_data['housingPoints']}') #pylint: disable=line-too-long
252252

253253
ldap_set_roomnumber(account, room_number)
254254
if onfloor_status:
@@ -289,7 +289,9 @@ def edit_uid(uid, flask_request, username):
289289
def edit_fid(uid, flask_request):
290290
log = logger.new(request=flask_request, auth_dict={'username': uid})
291291
post_data = flask_request.get_json()
292-
log.info(f'Edit freshman-{uid} - Room: {post_data['roomNumber']} On-Floor: {post_data['onfloorStatus']} Eval: {post_data['evalDate']} SigMiss: {post_data['sigMissed']}')
292+
293+
log.info(f'Edit freshman-{uid} - Room: {post_data['roomNumber']} On-Floor: {post_data['onfloorStatus']} Eval: {post_data['evalDate']} SigMiss: {post_data['sigMissed']}') #pylint: disable=line-too-long
294+
293295

294296
name = post_data['name']
295297

conditional/models/models.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class FreshmanAccount(db.Model):
1818
signatures_missed = Column(Integer)
1919
rit_username = Column(String(10), nullable=True)
2020

21-
def __init__(self, name, onfloor, room=None, missed=None, rit_username=None):
21+
def __init__(self, name, onfloor, room=None, missed=None, rit_username=None): # pylint: disable=too-many-positional-arguments
2222
self.name = name
2323
today = date.fromtimestamp(time.time())
2424
self.eval_date = today + timedelta(weeks=6)
@@ -32,8 +32,7 @@ class FreshmanEvalData(db.Model):
3232
__tablename__ = 'freshman_eval_data'
3333
id = Column(Integer, primary_key=True)
3434
uid = Column(String(32), nullable=False)
35-
freshman_project = Column(Enum('Pending', 'Passed', 'Failed',
36-
name="freshman_project_enum"), nullable=True)
35+
freshman_project = Column(Enum('Pending', 'Passed', 'Failed', name="freshman_project_enum"), nullable=True)
3736
eval_date = Column(DateTime, nullable=False)
3837
signatures_missed = Column(Integer, nullable=False)
3938
social_events = Column(Text)
@@ -143,7 +142,7 @@ class MajorProject(db.Model):
143142
name="major_project_enum"),
144143
nullable=False)
145144

146-
def __init__(self, uid, name, tldr, time, desc):
145+
def __init__(self, uid, name, tldr, time, desc): # pylint: disable=too-many-positional-arguments,redefined-outer-name
147146
self.uid = uid
148147
self.date = datetime.now()
149148
self.name = name
@@ -233,7 +232,7 @@ class Conditional(db.Model):
233232
s_evaluation = Column(ForeignKey('spring_evals.id'))
234233
i_evaluation = Column(ForeignKey('freshman_eval_data.id'))
235234

236-
def __init__(self, uid, description, due, s_eval=None, i_eval=None):
235+
def __init__(self, uid, description, due, s_eval=None, i_eval=None): # pylint: disable=too-many-positional-arguments
237236
self.uid = uid
238237
self.description = description
239238
self.date_due = due
@@ -293,7 +292,7 @@ class UserLog(db.Model):
293292
path = Column(String(128), nullable=False)
294293
description = Column(String(128), nullable=False)
295294

296-
def __init__(self, ipaddr, user, method, blueprint, path, description):
295+
def __init__(self, ipaddr, user, method, blueprint, path, description): # pylint: disable=too-many-positional-arguments
297296
self.ipaddr = ipaddr
298297
self.timestamp = datetime.now()
299298
self.uid = user

0 commit comments

Comments
 (0)