Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Return JSON errors instead of HTML errors for unknown resources. #11602

Merged
merged 7 commits into from
Dec 20, 2021
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Use super() in some places.
  • Loading branch information
clokep committed Dec 17, 2021
commit b370d63cb3aaa0c9e2da9ec61cf38a58f2d50f7a
6 changes: 3 additions & 3 deletions synapse/http/server.py
Original file line number Diff line number Diff line change
@@ -530,7 +530,7 @@ class RootRedirect(resource.Resource):
"""Redirects the root '/' path to another path."""

def __init__(self, path: str):
resource.Resource.__init__(self)
super().__init__()
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(I see no reason not to make these changes still...)

self.url = path

def render_GET(self, request: Request) -> bytes:
@@ -539,7 +539,7 @@ def render_GET(self, request: Request) -> bytes:
def getChild(self, name: str, request: Request) -> resource.Resource:
if len(name) == 0:
return self # select ourselves as the child to render
return resource.Resource.getChild(self, name, request)
return super().getChild(name, request)


class OptionsResource(resource.Resource):
@@ -556,7 +556,7 @@ def render_OPTIONS(self, request: Request) -> bytes:
def getChildWithDefault(self, path: str, request: Request) -> resource.Resource:
if request.method == b"OPTIONS":
return self # select ourselves as the child to render
return resource.Resource.getChildWithDefault(self, path, request)
return super().getChildWithDefault(path, request)


class RootOptionsRedirectResource(OptionsResource, RootRedirect):