fix: make teacher test exit without teacher auth

Consider adding an 'official' sa teacher account :\

Author: faretek1

scratchattach/site/activity.py

@@ -4,7 +4,7 @@
 import html
 import warnings
 
-from typing import Optional
+from typing import Optional, Any
 
 from bs4 import Tag
 from dataclasses import dataclass
@@ -20,7 +20,7 @@ class Activity(BaseSiteComponent):
     Represents a Scratch activity (message or other user page activity)
     """
     _session: Optional[session.Session] = None
-    raw = None
+    raw: Any = None
 
     id: Optional[int] = None
     actor_username: Optional[str] = None
@@ -51,8 +51,8 @@ class Activity(BaseSiteComponent):
     is_reshare: Optional[bool] = None
 
     datetime_created: Optional[str] = None
-    time = None
-    type = None
+    time: Any = None
+    type: str = None
 
     def __repr__(self):
         return f"Activity({repr(self.raw)})"

scratchattach/site/user.py

@@ -609,11 +609,11 @@ def post_comment(self, content, *, parent_id="", commentee_id=""):
         Posts a comment on the user's profile. You can only use this function if this object was created using :meth:`scratchattach.session.Session.connect_user`
 
         Args:
-            content: Content of the comment that should be posted
+            :param content: Content of the comment that should be posted
 
         Keyword Arguments:
-            parent_id: ID of the comment you want to reply to. If you don't want to mention a user, don't put the argument.
-            commentee_id: ID of the user that will be mentioned in your comment and will receive a message about your comment. If you don't want to mention a user, don't put the argument.
+            :param commentee_id: ID of the comment you want to reply to. If you don't want to mention a user, don't put the argument.
+            :param parent_id: ID of the user that will be mentioned in your comment and will receive a message about your comment. If you don't want to mention a user, don't put the argument.
 
         Returns:
             scratchattach.comment.Comment: An object representing the created comment.
@@ -636,8 +636,8 @@ def post_comment(self, content, *, parent_id="", commentee_id=""):
             else:
                 raise exceptions.CommentPostFailure(r.text)
 
+        text = r.text
         try:
-            text = r.text
             data = {
                 'id': text.split('<div id="comments-')[1].split('" class="comment')[0],
                 'author': {"username": text.split('" data-comment-user="')[1].split('"><img class')[0]},
@@ -648,18 +648,18 @@ def post_comment(self, content, *, parent_id="", commentee_id=""):
             _comment = comment.Comment(source=comment.CommentSource.USER_PROFILE, parent_id=None if parent_id=="" else parent_id, commentee_id=commentee_id, source_id=self.username, id=data["id"], _session = self._session, datetime = datetime.now())
             _comment._update_from_dict(data)
             return _comment
-        except Exception:
+        except Exception as e:
             if '{"error": "isFlood"}' in text:
                 raise(exceptions.CommentPostFailure(
-                    "You are being rate-limited for running this operation too often. Implement a cooldown of about 10 seconds."))
+                    "You are being rate-limited for running this operation too often. Implement a cooldown of about 10 seconds.")) from e
             elif '<script id="error-data" type="application/json">' in text:
                 raw_error_data = text.split('<script id="error-data" type="application/json">')[1].split('</script>')[0]
                 error_data = json.loads(raw_error_data)
                 expires = error_data['mute_status']['muteExpiresAt']
                 expires = datetime.fromtimestamp(expires, timezone.utc)
-                raise(exceptions.CommentPostFailure(f"You have been muted. Mute expires on {expires}"))
+                raise(exceptions.CommentPostFailure(f"You have been muted. Mute expires on {expires}")) from e
             else:
-                raise(exceptions.FetchError(f"Couldn't parse API response: {r.text!r}"))
+                raise(exceptions.FetchError(f"Couldn't parse API response: {r.text!r}")) from e
 
     def reply_comment(self, content, *, parent_id, commentee_id=""):
         """
@@ -671,11 +671,11 @@ def reply_comment(self, content, *, parent_id, commentee_id=""):
             Therefore, parent_id should be the comment id of a top level comment.
 
         Args:
-            content: Content of the comment that should be posted
+            :param content: Content of the comment that should be posted
 
         Keyword Arguments:
-            parent_id: ID of the comment you want to reply to
-            commentee_id: ID of the user that will be mentioned in your comment and will receive a message about your comment. If you don't want to mention a user, don't put the argument.
+            :param parent_id: ID of the comment you want to reply to
+            :param commentee_id: ID of the user that will be mentioned in your comment and will receive a message about your comment. If you don't want to mention a user, don't put the argument.
         """
         return self.post_comment(content, parent_id=parent_id, commentee_id=commentee_id)
 

tests/test_teacher_activity.py

@@ -2,28 +2,29 @@
 from datetime import datetime, timedelta, timezone
 
 
-
 def test_teacher_activity():
     sys.path.insert(0, ".")
     import scratchattach as sa
     from scratchattach.utils import exceptions
     import util
-    sess = util.teacher_session()
+
+    if not (sess := util.teacher_session()):
+        return
 
     # we cannot do assertions, but we can probe for any errors.
     cls = sess.mystuff_classes()[0]
 
     messages = [cls.activity(page=page) for page in range(1, 3)]
     for page in messages:
         for msg in page:
-            print(msg, end=' ')
+            _ = str(msg)
 
             try:
                 target = msg.target()
             except exceptions.CommentNotFound:
                 target = None
 
-            print(target)
+            _ = target
 
 
 if __name__ == "__main__":

tests/util/__init__.py

@@ -21,13 +21,13 @@ def session() -> _Session:
     return _session
 
 _teacher_session: Optional[_Session] = None
-def teacher_session() -> _Session:
+def teacher_session() -> Optional[_Session]:
     global _teacher_session
 
     if not _teacher_session:
         if "teacher_auth" not in __AUTH:
             warnings.warn(f"Could not test for teacher session")
-            exit(0)
+            return None
 
         data = __AUTH["teacher_auth"]
         _teacher_session = login(data["username"], data["password"])