From d8f94eeec23eba6274896e1aa2f92aa97ff10bee Mon Sep 17 00:00:00 2001
From: Shay <hillerys@element.io>
Date: Wed, 5 Jan 2022 09:53:05 -0800
Subject: [PATCH] Run `pyupgrade --py37-plus --keep-percent-format` on Synapse
 (#11685)

* newsfragment

* fix newsfragment number

* update changelog

* remove extra space
---
 changelog.d/11685.misc                    | 1 +
 synapse/rest/admin/media.py               | 2 +-
 synapse/storage/databases/main/session.py | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/11685.misc

diff --git a/changelog.d/11685.misc b/changelog.d/11685.misc
new file mode 100644
index 000000000..c4566b201
--- /dev/null
+++ b/changelog.d/11685.misc
@@ -0,0 +1 @@
+Run `pyupgrade --py37-plus --keep-percent-format` on Synapse.
diff --git a/synapse/rest/admin/media.py b/synapse/rest/admin/media.py
index 7236e4027..299f5c9eb 100644
--- a/synapse/rest/admin/media.py
+++ b/synapse/rest/admin/media.py
@@ -466,7 +466,7 @@ class UserMediaRestServlet(RestServlet):
         )
 
         deleted_media, total = await self.media_repository.delete_local_media_ids(
-            ([row["media_id"] for row in media])
+            [row["media_id"] for row in media]
         )
 
         return HTTPStatus.OK, {"deleted_media": deleted_media, "total": total}
diff --git a/synapse/storage/databases/main/session.py b/synapse/storage/databases/main/session.py
index 5a9712043..e8c776b97 100644
--- a/synapse/storage/databases/main/session.py
+++ b/synapse/storage/databases/main/session.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #  Copyright 2021 The Matrix.org Foundation C.I.C.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");