Skip to content

Commit c386b05

Browse files
Now pylint compatible
1 parent e1ba438 commit c386b05

File tree

4 files changed

+37
-34
lines changed

4 files changed

+37
-34
lines changed

packet/__init__.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import logging
66
import os
77

8+
from typing import Union
9+
810
import onesignal
911
from flask import Flask
1012
from flask_gzip import Gzip
@@ -13,8 +15,6 @@
1315
from flask_pyoidc.provider_configuration import ProviderConfiguration, ClientMetadata
1416
from flask_sqlalchemy import SQLAlchemy
1517

16-
from typing import Union
17-
1818
import sentry_sdk
1919
from sentry_sdk.integrations.flask import FlaskIntegration
2020
from sentry_sdk.integrations.sqlalchemy import SqlalchemyIntegration
@@ -99,14 +99,14 @@
9999
'models',
100100
'context_processors',
101101
'commands',
102-
'api',
103-
'shared',
102+
'api', # pylint: disable=undefined-all-variable
103+
'shared', # pylint: disable=undefined-all-variable
104104
)
105105

106106
if app.config['REALM'] == 'csh':
107-
from .routes import upperclassmen as upperclassmen
108-
from .routes import admin as admin
107+
from .routes import upperclassmen as upperclassmen # pylint: disable=useless-import-alias
108+
from .routes import admin as admin # pylint: disable=useless-import-alias
109109
else:
110-
from .routes import freshmen as freshmen
110+
from .routes import freshmen as freshmen # pylint: disable=useless-import-alias
111111

112112
app.logger.info('Routes registered')

packet/commands.py

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44

55
import sys
66

7+
from typing import Union
78
from secrets import token_hex
8-
from datetime import datetime, time, date
9+
from datetime import datetime, time, date\
10+
911
import csv
1012
import click
11-
from typing import Union
1213

1314
from . import app, db
1415
from .models import Packet, FreshSignature, UpperSignature, MiscSignature
@@ -208,22 +209,18 @@ def fetch_results(file_path: str, use_csv: bool, date_str: str) -> None:
208209
writer.writerows(data)
209210
else:
210211
for row in data:
211-
"""
212-
Old
213-
214-
file_handle.write(
215-
f'''
216-
{row[0]}
217-
\t{column_titles[1]}: {row[1]}
218-
\t{column_titles[2]}: {row[2]}
219-
\t{column_titles[3]}: {row[3]}
220-
\t{column_titles[4]}: {row[4]}
221-
\t{column_titles[5]}: {row[5]}
222-
223-
\t{column_titles[6]}: {row[6]}
224-
'''
225-
)
226-
"""
212+
# Old
213+
#file_handle.write(
214+
# f'''
215+
# {row[0]}
216+
# \t{column_titles[1]}: {row[1]}
217+
# \t{column_titles[2]}: {row[2]}
218+
# \t{column_titles[3]}: {row[3]}
219+
# \t{column_titles[4]}: {row[4]}
220+
# \t{column_titles[5]}: {row[5]}
221+
# \t{column_titles[6]}: {row[6]}
222+
# '''
223+
#)
227224

228225
out: str = str(row[0]) + '\n'
229226

packet/ldap.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from functools import lru_cache
66
from datetime import date
7-
from typing import Optional, cast, Any, Union
7+
from typing import Optional, cast, Any
88

99
from csh_ldap import CSHLDAP, CSHMember
1010

@@ -34,7 +34,7 @@ def __init__(
3434

3535
self.room_number: Optional[int] = room_number if room_number else None
3636

37-
self.cn: str = cn if cn else uid.title()
37+
self.cn: str = cn if cn else uid.title() # pylint: disable=invalid-name
3838

3939
def __eq__(self, other: Any) -> bool:
4040
"""
@@ -401,7 +401,7 @@ def is_on_coop(self, member: CSHMember) -> bool:
401401

402402
return self._is_member_of_group(member, 'spring_coop')
403403

404-
def get_roomnumber(self, member: CSHMember) -> Optional[int]:
404+
def get_roomnumber(self, member: CSHMember) -> Optional[int]: # pylint: disable=no-self-use
405405
"""
406406
Get the room number of a member.
407407

packet/utils.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -255,11 +255,14 @@ def sync_freshman(freshmen_list: dict) -> None:
255255
# Update the freshmen signatures of each open or future packet
256256
for packet in Packet.query.filter(Packet.end > datetime.now()).all():
257257
current_fresh_sigs = set(map(lambda fresh_sig: fresh_sig.freshman_username, packet.fresh_signatures))
258-
for list_freshman in filter(
259-
lambda list_freshman: list_freshman.rit_username not in current_fresh_sigs
260-
and list_freshman.rit_username != packet.freshman_username,
261-
freshmen_list.values(),
262-
):
258+
259+
for list_freshman in freshmen_list.values():
260+
if list_freshman.rit_username in current_fresh_sigs:
261+
continue
262+
263+
if list_freshman.rit_username == packet.freshman_username:
264+
continue
265+
263266
db.session.add(FreshSignature(packet=packet, freshman=freshmen_in_db[list_freshman.rit_username]))
264267

265268
db.session.commit()
@@ -375,7 +378,10 @@ def sync_with_ldap() -> None:
375378

376379
# Create UpperSignatures for any new active members
377380
upper_sigs = set(map(lambda sig: sig.member, packet.upper_signatures))
378-
for member in filter(lambda member: member not in upper_sigs, all_upper):
381+
for member in all_upper:
382+
if member in upper_sigs:
383+
continue
384+
379385
sig = UpperSignature(packet=packet, member=member)
380386
sig.eboard = ldap.get_eboard_role(all_upper[sig.member])
381387
sig.active_rtp = sig.member in rtp

0 commit comments

Comments
 (0)