fix lint

Author: costowell

packet/context_processors.py

@@ -62,9 +62,9 @@ def get_rit_image(username: str) -> str:
         for addr in addresses:
             url = 'https://gravatar.com/avatar/' + hashlib.md5(addr.encode('utf8')).hexdigest() + '.jpg?d=404&s=250'
             try:
-                gravatar = urllib.request.urlopen(url)
-                if gravatar.getcode() == 200:
-                    return url
+                with urllib.request.urlopen(url) as gravatar:
+                    if gravatar.getcode() == 200:
+                        return url
             except:
                 continue
     return 'https://www.gravatar.com/avatar/freshmen?d=mp&f=y'

packet/ldap.py

@@ -13,7 +13,11 @@
 
 class MockMember:
 
-    def __init__(self, uid: str, groups: list = None, cn: str = None, room_number: int = None):
+    def __init__(self,
+                 uid: str,
+                 groups: Optional[list] = None,
+                 cn: Optional[str] = None,
+                 room_number: Optional[int] = None):
         self.uid = uid
         self.groups = groups if groups else list()
         if room_number:
@@ -37,7 +41,7 @@ def __repr__(self) -> str:
 
 class LDAPWrapper:
 
-    def __init__(self, cshldap: CSHLDAP = None, mock_members: list[MockMember] = None):
+    def __init__(self, cshldap: Optional[CSHLDAP] = None, mock_members: Optional[list[MockMember]] = None):
         self.ldap = cshldap
         self.mock_members = cast(list[MockMember], mock_members)
         if self.ldap:

packet/mail.py

@@ -15,7 +15,7 @@ class ReportForm(TypedDict):
 
 def send_start_packet_mail(packet: Packet) -> None:
     if app.config['MAIL_PROD']:
-        recipients = ['<' + packet.freshman.rit_username + '@rit.edu>']
+        recipients = ['<' + str(packet.freshman.rit_username) + '@rit.edu>']
         msg = Message(subject='CSH Packet Starts ' + packet.start.strftime('%A, %B %-d'),
                       sender=app.config.get('MAIL_USERNAME'),
                       recipients=recipients)

packet/routes/freshmen.py

@@ -2,7 +2,7 @@
 Routes available to freshmen only
 """
 
-from flask import redirect, url_for
+from flask import Response, redirect, url_for
 
 from packet import app
 from packet.models import Packet
@@ -12,7 +12,7 @@
 @app.route('/')
 @packet_auth
 @before_request
-def index(info=None):
+def index(info=None) -> Response:
     most_recent_packet = Packet.query.filter_by(freshman_username=info['uid']).order_by(Packet.id.desc()).first()
 
     if most_recent_packet is not None:

requirements.in

@@ -3,7 +3,7 @@ Flask-Mail==0.10.0
 Flask-Migrate~=2.7.0
 Flask-pyoidc~=3.7.0
 Flask~=1.1.4
-csh_ldap~=2.4.0
+csh-ldap @ git+https://github.com/costowell/csh_ldap@67dd183744746c758d6c13878f539437d2628b63
 ddtrace==3.12.2
 flask_sqlalchemy~=2.5.1
 gunicorn~=20.0.4

requirements.txt

@@ -28,7 +28,7 @@ click==7.1.2
     #   pip-tools
 cryptography==45.0.6
     # via oic
-csh-ldap==2.4.0
+csh-ldap @ git+https://github.com/costowell/csh_ldap@67dd183744746c758d6c13878f539437d2628b63
     # via -r requirements.in
 ddtrace==3.12.2
     # via -r requirements.in
@@ -141,7 +141,7 @@ pylint-quotes==0.2.3
     # via -r requirements.in
 python-dotenv==1.1.1
     # via pydantic-settings
-python-ldap==3.4.0
+python-ldap==3.4.4
     # via csh-ldap
 requests==2.32.5
     # via