Fixed code misc. quality issues (#9649)

- Merge 'isinstance' calls.
- Remove unnecessary dict call outside of comprehension.
- Use 'sys.exit()' calls.

changelog.d/9649.misc

@@ -0,0 +1 @@
+Fixed some antipattern issues to improve code quality.

scripts/move_remote_media_to_new_store.py

@@ -51,7 +51,7 @@ def main(src_repo, dest_repo):
         parts = line.split("|")
         if len(parts) != 2:
             print("Unable to parse input line %s" % line, file=sys.stderr)
-            exit(1)
+            sys.exit(1)
 
         move_media(parts[0], parts[1], src_paths, dest_paths)
 

synapse/push/httppusher.py

@@ -290,7 +290,7 @@ async def _process_one(self, push_action: dict) -> bool:
         if rejected is False:
             return False
 
-        if isinstance(rejected, list) or isinstance(rejected, tuple):
+        if isinstance(rejected, (list, tuple)):
             for pk in rejected:
                 if pk != self.pushkey:
                     # for sanity, we only remove the pushkey if it

synapse/util/frozenutils.py

@@ -36,7 +36,7 @@ def freeze(o):
 
 def unfreeze(o):
     if isinstance(o, (dict, frozendict)):
-        return dict({k: unfreeze(v) for k, v in o.items()})
+        return {k: unfreeze(v) for k, v in o.items()}
 
     if isinstance(o, (bytes, str)):
         return o