From 95b33b83b5349adad65216aa23d5a044aef9b4c0 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <anders@zulip.com>
Date: Thu, 26 Oct 2023 13:41:24 -0700
Subject: [PATCH] mypy: Enable redundant-expr error.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
---
 pyproject.toml                                      | 1 +
 zulip/integrations/rss/rss-bot                      | 6 ++++--
 zulip_bots/zulip_bots/bots/salesforce/salesforce.py | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 9fa55752..86688ecc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -36,6 +36,7 @@ warn_return_any = false
 # Enable optional errors.
 enable_error_code = [
     "redundant-self",
+    "redundant-expr",
     "truthy-bool",
     "truthy-iterable",
     "unused-awaitable",
diff --git a/zulip/integrations/rss/rss-bot b/zulip/integrations/rss/rss-bot
index a2089f32..1cef95c0 100755
--- a/zulip/integrations/rss/rss-bot
+++ b/zulip/integrations/rss/rss-bot
@@ -14,7 +14,7 @@ import sys
 import time
 import urllib.parse
 from html.parser import HTMLParser
-from typing import Any, Dict, List, Tuple
+from typing import Any, Dict, List, Optional, Tuple
 
 import feedparser
 
@@ -225,7 +225,9 @@ for feed_url in feed_urls:
     for entry in data.entries:
         entry_hash = compute_entry_hash(entry)
         # An entry has either been published or updated.
-        entry_time: Tuple[int, int] = entry.get("published_parsed", entry.get("updated_parsed"))
+        entry_time: Optional[Tuple[int, int]] = entry.get(
+            "published_parsed", entry.get("updated_parsed")
+        )
         if (
             entry_time is not None
             and (time.time() - calendar.timegm(entry_time)) > OLDNESS_THRESHOLD * 60 * 60 * 24
diff --git a/zulip_bots/zulip_bots/bots/salesforce/salesforce.py b/zulip_bots/zulip_bots/bots/salesforce/salesforce.py
index ff2aa770..d2f3d412 100644
--- a/zulip_bots/zulip_bots/bots/salesforce/salesforce.py
+++ b/zulip_bots/zulip_bots/bots/salesforce/salesforce.py
@@ -152,7 +152,7 @@ class SalesforceHandler:
             for command_keyword in command["commands"]:
                 if content.startswith(command_keyword):
                     args = content.replace(command_keyword, "").strip()
-                    if args is not None and args != "":
+                    if args != "":
                         if "callback" in command.keys():
                             return command["callback"](args, self.sf, command)
                         else: