fix: handle last_login date of null (pypi#14756)

miketheman · Oct 16, 2023 · 92856ad · 92856ad
1 parent 85a5f17
commit 92856ad
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/warehouse/email/__init__.py b/warehouse/email/__init__.py
@@ -274,11 +274,11 @@ def send_password_reset_email(request, user_and_email):
         {
             "action": "password-reset",
             "user.id": str(user.id),
-            "user.last_login": str(user.last_login),
+            "user.last_login": str(
+                user.last_login or datetime.datetime.min.replace(tzinfo=pytz.UTC)
+            ),
             "user.password_date": str(
-                user.password_date
-                if user.password_date is not None
-                else datetime.datetime.min.replace(tzinfo=pytz.UTC)
+                user.password_date or datetime.datetime.min.replace(tzinfo=pytz.UTC)
             ),
         }
     )