Skip to content

Commit 5c71b50

Browse files
committed
Applies black Bump from 23.10.1 to 24.2.0 (element-hq#16936)
1 parent 6272437 commit 5c71b50

File tree

5 files changed

+6
-9
lines changed

5 files changed

+6
-9
lines changed

synapse/http/servlet.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ def parse_integer(
7575
default: Optional[int] = None,
7676
required: bool = False,
7777
negative: bool = False,
78-
) -> int:
79-
...
78+
) -> int: ...
8079

8180

8281
def parse_integer(
@@ -131,8 +130,7 @@ def parse_integer_from_args(
131130
default: Optional[int] = None,
132131
required: bool = False,
133132
negative: bool = False,
134-
) -> Optional[int]:
135-
...
133+
) -> Optional[int]: ...
136134

137135

138136
def parse_integer_from_args(

synapse/rest/admin/federation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from typing import TYPE_CHECKING, Tuple
2424

2525
from synapse.api.constants import Direction
26-
from synapse.api.errors import Codes, NotFoundError, SynapseError
26+
from synapse.api.errors import NotFoundError, SynapseError
2727
from synapse.federation.transport.server import Authenticator
2828
from synapse.http.servlet import RestServlet, parse_enum, parse_integer, parse_string
2929
from synapse.http.site import SynapseRequest

synapse/rest/admin/media.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,6 @@ async def on_POST(
323323
errcode=Codes.INVALID_PARAM,
324324
)
325325

326-
327326
# This check is useless, we keep it for the legacy endpoint only.
328327
if server_name is not None and self.server_name != server_name:
329328
raise SynapseError(HTTPStatus.BAD_REQUEST, "Can only delete local media")
@@ -425,7 +424,6 @@ async def on_DELETE(
425424
start = parse_integer(request, "from", default=0, negative=False)
426425
limit = parse_integer(request, "limit", default=100, negative=False)
427426

428-
429427
# If neither `order_by` nor `dir` is set, set the default order
430428
# to newest media is on top for backward compatibility.
431429
if b"order_by" not in request.args and b"dir" not in request.args:

synapse/rest/admin/statistics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
6767
limit = parse_integer(request, "limit", default=100, negative=False)
6868
from_ts = parse_integer(request, "from_ts", default=0, negative=False)
6969
until_ts = parse_integer(request, "until_ts", negative=False)
70-
70+
7171
if until_ts is not None:
7272
if until_ts <= from_ts:
7373
raise SynapseError(

tests/rest/admin/test_media.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,8 @@ def test_missing_parameter(self) -> None:
277277
self.assertEqual(400, channel.code, msg=channel.json_body)
278278
self.assertEqual(Codes.MISSING_PARAM, channel.json_body["errcode"])
279279
self.assertEqual(
280-
"Missing required integer query parameter before_ts", channel.json_body["error"]
280+
"Missing required integer query parameter before_ts",
281+
channel.json_body["error"],
281282
)
282283

283284
def test_invalid_parameter(self) -> None:

0 commit comments

Comments
 (0)