python: Fix PAR001 Redundant parentheses.

Signed-off-by: Anders Kaseorg <[email protected]>

Author: andersk

tools/custom_check.py

@@ -36,17 +36,6 @@
             "good_lines": ["def foo (self):"],
             "bad_lines": ["def foo(self: Any):"],
         },
-        # This next check could have false positives, but it seems pretty
-        # rare; if we find any, they can be added to the exclude list for
-        # this rule.
-        {
-            "pattern": r" % [a-zA-Z0-9_.]*\)?$",
-            "description": "Used % comprehension without a tuple",
-        },
-        {
-            "pattern": r".*%s.* % \([a-zA-Z0-9_.]*\)$",
-            "description": "Used % comprehension without a tuple",
-        },
         {
             "pattern": r"__future__",
             "include_only": {"zulip_bots/zulip_bots/bots/"},

tools/provision

@@ -43,7 +43,7 @@ the Python version this command is executed with."""
     py_version = tuple(int(num) for num in py_version_list[0:2])
     venv_name = f"zulip-api-py{py_version[0]}-venv"
 
-    if py_version <= (3, 1) and (not options.force):
+    if py_version <= (3, 1) and not options.force:
         print(
             red
             + "Provision failed: Cannot create venv with outdated Python version ({}).\n"

zulip/integrations/bridge_with_irc/irc_mirror_backend.py

@@ -75,7 +75,7 @@ def forward_to_irc(msg: Dict[str, Any]) -> None:
                 in_the_specified_stream = msg["display_recipient"] == self.stream
                 at_the_specified_subject = msg["subject"].casefold() == self.topic.casefold()
                 if in_the_specified_stream and at_the_specified_subject:
-                    msg["content"] = ("@**{}**: ".format(msg["sender_full_name"])) + msg["content"]
+                    msg["content"] = "@**{}**: ".format(msg["sender_full_name"]) + msg["content"]
                     send = lambda x: self.c.privmsg(self.channel, x)
                 else:
                     return

zulip/integrations/google/google-calendar

@@ -82,7 +82,7 @@ parser.add_argument(
 
 options = parser.parse_args()
 
-if not (options.zulip_email):
+if not options.zulip_email:
     parser.error("You must specify --user")
 
 zulip_client = zulip.init_from_options(options)

zulip/integrations/rss/rss-bot

@@ -227,15 +227,15 @@ for feed_url in feed_urls:
         )
         if (
             entry_time is not None
-            and (time.time() - calendar.timegm(entry_time)) > OLDNESS_THRESHOLD * 60 * 60 * 24
+            and time.time() - calendar.timegm(entry_time) > OLDNESS_THRESHOLD * 60 * 60 * 24
         ):
             # As a safeguard against misbehaving feeds, don't try to process
             # entries older than some threshold.
             continue
         if entry_hash in old_feed_hashes:
             # We've already seen this. No need to process any older entries.
             break
-        if (not old_feed_hashes) and (len(new_hashes) >= 3):
+        if not old_feed_hashes and len(new_hashes) >= 3:
             # On a first run, pick up the 3 most recent entries. An RSS feed has
             # entries in reverse chronological order.
             break

zulip/integrations/trello/zulip_trello.py

@@ -122,7 +122,7 @@ def main() -> None:
     parser.add_argument(
         "--trello-board-id",
         required=True,
-        help=("The Trello board short ID. Can usually be found in the URL of the Trello board."),
+        help="The Trello board short ID. Can usually be found in the URL of the Trello board.",
     )
     parser.add_argument(
         "--trello-api-key",

zulip/integrations/zephyr/zephyr_mirror_backend.py

@@ -474,7 +474,7 @@ def process_notice(
     # Drop messages not to the listed subscriptions
     if is_personal and not options.forward_personals:
         return
-    if (zephyr_class.lower() not in current_zephyr_subs) and not is_personal:
+    if zephyr_class.lower() not in current_zephyr_subs and not is_personal:
         logger.debug("Skipping ... %s/%s/%s", zephyr_class, zephyr_instance, is_personal)
         return
     if notice.z_default_format.startswith(b"Zephyr error: See") or notice.z_default_format.endswith(
@@ -916,7 +916,7 @@ def maybe_forward_to_zephyr(message: Dict[str, Any], zulip_client: zulip.Client)
     # The key string can be used to direct any type of text.
     if message["sender_email"] == zulip_account_email:
         if not (
-            (message["type"] == "stream")
+            message["type"] == "stream"
             or (
                 message["type"] == "private"
                 and False

zulip/zulip/cli.py

@@ -60,7 +60,7 @@ def send_message(recipients: List[str], stream: str, subject: str, message: str)
     if len(recipients) != 0 and has_stream:
         click.echo("You cannot specify both a username and a stream/subject.")
         raise SystemExit(1)
-    if len(recipients) == 0 and (has_stream != has_subject):
+    if len(recipients) == 0 and has_stream != has_subject:
         click.echo("Stream messages must have a subject")
         raise SystemExit(1)
     if len(recipients) == 0 and not has_stream:

zulip/zulip/send.py

@@ -77,7 +77,7 @@ def main() -> int:
     # Sanity check user data
     if len(options.recipients) != 0 and (options.stream or options.subject):
         parser.error("You cannot specify both a username and a stream/subject.")
-    if len(options.recipients) == 0 and (bool(options.stream) != bool(options.subject)):
+    if len(options.recipients) == 0 and bool(options.stream) != bool(options.subject):
         parser.error("Stream messages must have a subject")
     if len(options.recipients) == 0 and not (options.stream and options.subject):
         parser.error("You must specify a stream/subject or at least one recipient.")

zulip_bots/zulip_bots/bots/chessbot/chessbot.py

@@ -401,7 +401,7 @@ def make_loss_response(board: chess.Board, reason: str) -> str:
 
     Returns: The loss response string.
     """
-    return ("*{}* {}. **{}** wins!\n\n{}").format(
+    return "*{}* {}. **{}** wins!\n\n{}".format(
         "White" if board.turn else "Black",
         reason,
         "Black" if board.turn else "White",
@@ -418,7 +418,7 @@ def make_not_legal_response(board: chess.Board, move_san: str) -> str:
 
     Returns: The not-legal-move response string.
     """
-    return ("Sorry, the move *{}* isn't legal.\n\n{}\n\n\n{}").format(
+    return "Sorry, the move *{}* isn't legal.\n\n{}\n\n\n{}".format(
         move_san, make_str(board, board.turn), make_footer()
     )