typing: Apply trivial none-checks with assertions as necessary.

Signed-off-by: Zixuan James Li <p359101898@gmail.com>

analytics/views/support.py

@@ -165,6 +165,7 @@ def support(
         if len(keys) != 2:
             raise JsonableError(_("Invalid parameters"))
 
+        assert realm_id is not None
         realm = Realm.objects.get(id=realm_id)
 
         acting_user = request.user

corporate/lib/stripe.py

@@ -1178,6 +1178,7 @@ def switch_realm_from_standard_to_plus_plan(realm: Realm) -> None:
         LicenseLedger.objects.filter(is_renewal=True, plan=standard_plan).order_by("id").last()
     )
     assert standard_plan_last_renewal_ledger is not None
+    assert standard_plan.price_per_license is not None
     standard_plan_last_renewal_amount = (
         standard_plan_last_renewal_ledger.licenses * standard_plan.price_per_license
     )

zerver/actions/invites.py

@@ -266,6 +266,7 @@ def do_get_invites_controlled_by_user(user_profile: UserProfile) -> List[Dict[st
     invites = []
 
     for invitee in prereg_users:
+        assert invitee.referred_by is not None
         invites.append(
             dict(
                 email=invitee.email,

zerver/lib/camo.py

@@ -6,6 +6,7 @@ from django.conf import settings
 
 def generate_camo_url(url: str) -> str:
     encoded_url = url.encode()
+    assert settings.CAMO_KEY is not None
     encoded_camo_key = settings.CAMO_KEY.encode()
     digest = hmac.new(encoded_camo_key, encoded_url, hashlib.sha1).hexdigest()
     return f"{digest}/{encoded_url.hex()}"

zerver/lib/export.py

@@ -31,6 +31,7 @@ from scripts.lib.zulip_tools import overwrite_symlink
 from zerver.lib.avatar_hash import user_avatar_path_from_ids
 from zerver.lib.pysa import mark_sanitized
 from zerver.lib.upload import get_bucket
+from zerver.lib.utils import assert_is_not_none
 from zerver.models import (
     AlertWord,
     Attachment,
@@ -435,7 +436,7 @@ def floatify_datetime_fields(data: TableData, table: TableName) -> None:
                 dt = timezone_make_aware(orig_dt)
             else:
                 dt = orig_dt
-            utc_naive = dt.replace(tzinfo=None) - dt.utcoffset()
+            utc_naive = dt.replace(tzinfo=None) - assert_is_not_none(dt.utcoffset())
             item[field] = (utc_naive - datetime.datetime(1970, 1, 1)).total_seconds()
 
 

zerver/lib/logging_util.py

@@ -5,7 +5,7 @@ import threading
 import traceback
 from datetime import datetime, timedelta, timezone
 from logging import Logger
-from typing import Optional, Tuple
+from typing import Optional, Tuple, Union
 
 import orjson
 from django.conf import settings
@@ -255,10 +255,11 @@ class ZulipWebhookFormatter(ZulipFormatter):
             return super().format(record)
 
         if request.content_type == "application/json":
-            payload = request.body
+            payload: Union[str, bytes, None] = request.body
         else:
             payload = request.POST.get("payload")
 
+        assert payload is not None
         try:
             payload = orjson.dumps(orjson.loads(payload), option=orjson.OPT_INDENT_2).decode()
         except orjson.JSONDecodeError:

zerver/lib/stream_subscription.py

@@ -93,6 +93,7 @@ def get_used_colors_for_user_ids(user_ids: List[int]) -> Dict[int, Set[str]]:
     result: Dict[int, Set[str]] = defaultdict(set)
 
     for row in list(query):
+        assert row["color"] is not None
         result[row["user_profile_id"]].add(row["color"])
 
     return result