summary refs log tree commit diff
path: root/synapse/http
diff options
context:
space:
mode:
authorJonathan de Jong <jonathan@automatia.nl>2021-07-19 16:28:05 +0200
committerGitHub <noreply@github.com>2021-07-19 15:28:05 +0100
commit95e47b2e782b5e7afa5fd2afd1d0ea7745eaac36 (patch)
tree790fadd03146a98be794c3d26b34224241a26271 /synapse/http
parentRemove unused `events_by_room` (#10421) (diff)
downloadsynapse-95e47b2e782b5e7afa5fd2afd1d0ea7745eaac36.tar.xz
[pyupgrade] `synapse/` (#10348)
This PR is tantamount to running 
```
pyupgrade --py36-plus --keep-percent-format `find synapse/ -type f -name "*.py"`
```

Part of #9744
Diffstat (limited to 'synapse/http')
-rw-r--r--synapse/http/proxyagent.py2
-rw-r--r--synapse/http/site.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/proxyagent.py b/synapse/http/proxyagent.py
index 7a6a1717de..f7193e60bd 100644
--- a/synapse/http/proxyagent.py
+++ b/synapse/http/proxyagent.py
@@ -172,7 +172,7 @@ class ProxyAgent(_AgentBase):
         """
         uri = uri.strip()
         if not _VALID_URI.match(uri):
-            raise ValueError("Invalid URI {!r}".format(uri))
+            raise ValueError(f"Invalid URI {uri!r}")
 
         parsed_uri = URI.fromBytes(uri)
         pool_key = (parsed_uri.scheme, parsed_uri.host, parsed_uri.port)
diff --git a/synapse/http/site.py b/synapse/http/site.py
index 3b0a38124e..190084e8aa 100644
--- a/synapse/http/site.py
+++ b/synapse/http/site.py
@@ -384,7 +384,7 @@ class SynapseRequest(Request):
         # authenticated (e.g. and admin is puppetting a user) then we log both.
         requester, authenticated_entity = self.get_authenticated_entity()
         if authenticated_entity:
-            requester = "{}.{}".format(authenticated_entity, requester)
+            requester = f"{authenticated_entity}.{requester}"
 
         self.site.access_logger.log(
             log_level,