Strict nullability for rest of lib.user

pycroft/helpers/printing/__init__.py

@@ -100,7 +100,7 @@ def generate_user_sheet(
     new_user: bool,
     wifi: bool,
     bank_account: BankAccount,
-    user: User | None = None,
+    user: User = None,
     user_id: str | None = None,
     plain_user_password: str | None = None,
     generation_purpose: str = "",

pycroft/lib/mail.py

@@ -18,13 +18,13 @@
 
 from pycroft.lib.exc import PycroftLibException
 
-mail_envelope_from = os.environ.get('PYCROFT_MAIL_ENVELOPE_FROM')
-mail_from = os.environ.get('PYCROFT_MAIL_FROM')
-mail_reply_to = os.environ.get('PYCROFT_MAIL_REPLY_TO')
-smtp_host = os.environ.get('PYCROFT_SMTP_HOST')
+mail_envelope_from = os.environ["PYCROFT_MAIL_ENVELOPE_FROM"]
+mail_from = os.environ["PYCROFT_MAIL_FROM"]
+mail_reply_to = os.environ["PYCROFT_MAIL_REPLY_TO"]
+smtp_host = os.environ["PYCROFT_SMTP_HOST"]
 smtp_port = int(os.environ.get('PYCROFT_SMTP_PORT', 465))
-smtp_user = os.environ.get('PYCROFT_SMTP_USER')
-smtp_password = os.environ.get('PYCROFT_SMTP_PASSWORD')
+smtp_user = os.environ["PYCROFT_SMTP_USER"]
+smtp_password = os.environ["PYCROFT_SMTP_PASSWORD"]
 smtp_ssl = os.environ.get('PYCROFT_SMTP_SSL', 'ssl')
 template_path_type = os.environ.get('PYCROFT_TEMPLATE_PATH_TYPE', 'filesystem')
 template_path = os.environ.get('PYCROFT_TEMPLATE_PATH', 'pycroft/templates')

pycroft/lib/user/blocking.py

@@ -29,7 +29,7 @@ def block(
     user: User,
     reason: str,
     processor: User,
-    during: Interval[DateTimeTz] = None,
+    during: Interval[DateTimeTz] | None = None,
     violation: bool = True,
 ) -> User:
     """Suspend a user during a given interval.

pycroft/lib/user/edit.py

@@ -98,7 +98,7 @@ def edit_email(
 
 
 @with_transaction
-def edit_birthdate(user: User, birthdate: date, processor: User) -> User:
+def edit_birthdate(user: User, birthdate: date | None, processor: User) -> User:
     """
     Changes the birthdate of a user and creates a log entry.
 

pycroft/lib/user/mail.py

@@ -38,7 +38,7 @@ def format_user_mail(user: User, text: str) -> str:
         id=encode_type2_user_id(user.id),
         email=user.email if user.email else "-",
         email_internal=user.email_internal,
-        room_short=user.room.short_name if user.room_id is not None else "-",
+        room_short=user.room.short_name if user.room is not None else "-",
         swdd_person_id=user.swdd_person_id if user.swdd_person_id else "-",
     )
 
@@ -48,8 +48,8 @@ def user_send_mails(
     template: MailTemplate | None = None,
     soft_fail: bool = False,
     use_internal: bool = True,
-    body_plain: str = None,
-    subject: str = None,
+    body_plain: str | None = None,
+    subject: str | None = None,
     **kwargs: t.Any,
 ) -> None:
     """
@@ -94,6 +94,8 @@ def user_send_mails(
             # No template given, use formatted body_mail instead.
             if not isinstance(user, User):
                 raise ValueError("Plaintext email not supported for other User types.")
+            if body_plain is None:
+                raise ValueError("Must use either template or body_plain")
 
             html = None
             plaintext = format_user_mail(user, body_plain)

pycroft/lib/user/user_sheet.py

@@ -13,9 +13,9 @@
 def store_user_sheet(
     new_user: bool,
     wifi: bool,
-    user: User | None = None,
+    user: User,
     timeout: int = 15,
-    plain_user_password: str = None,
+    plain_user_password: str | None = None,
     generation_purpose: str = "",
     plain_wifi_password: str = "",
 ) -> WebStorage:
@@ -65,7 +65,7 @@ def get_user_sheet(sheet_id: int) -> bytes | None:
 def generate_user_sheet(
     new_user: bool,
     wifi: bool,
-    user: User | None = None,
+    user: User,
     plain_user_password: str | None = None,
     generation_purpose: str = "",
     plain_wifi_password: str = "",

pyproject.toml

@@ -145,7 +145,6 @@ module = [
     "ldap_sync.*",
     "pycroft.lib",
     "pycroft.lib.*",
-    "pycroft.lib.user.*",
     "pycroft.external_services",
     "pycroft.external_services.*",
     "pycroft.helpers",
@@ -172,9 +171,9 @@ disallow_untyped_globals = true
 module = [
     "pycroft.model.task_serialization",
     "pycroft.lib.finance",
-    "pycroft.lib.user.lifecycle",
-    "pycroft.lib.user.mail_confirmation",
-    "pycroft.lib.user.member_request",
+    "pycroft.lib.mail",
+    "pycroft.lib.user",
+    "pycroft.lib.user.*",
 ]
 strict_optional = true