Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't use a closure over a class for WaveHandler #29461

Merged
merged 1 commit into from
Jun 23, 2021
Merged

Don't use a closure over a class for WaveHandler #29461

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 11 additions & 5 deletions tools/serve/wave.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@
from tools.wpt import wpt


class WaveHandler:
def __init__(self, server):
self.server = server

def __call__(self, request, response):
self.server.handle_request(request, response)


def get_route_builder_func(report):
def get_route_builder(logger, aliases, config):
wave_cfg = None
Expand All @@ -31,17 +39,13 @@ def get_route_builder(logger, aliases, config):
reports_enabled=report,
tests=data["items"])

class WaveHandler(object):
def __call__(self, request, response):
wave_server.handle_request(request, response)

web_root = "wave"
if wave_cfg is not None and "web_root" in wave_cfg:
web_root = wave_cfg["web_root"]
if not web_root.startswith("/"):
web_root = "/" + web_root

wave_handler = WaveHandler()
wave_handler = WaveHandler(wave_server)
builder.add_handler("*", web_root + "*", wave_handler)
# serving wave specifc testharnessreport.js
file_path = os.path.join(wpt.localpaths.repo_root, "tools/wave/resources/testharnessreport.js")
Expand All @@ -54,6 +58,7 @@ def __call__(self, request, response):
return builder
return get_route_builder


class ConfigBuilder(serve.ConfigBuilder):
_default = serve.ConfigBuilder._default
_default.update({
Expand All @@ -70,6 +75,7 @@ class ConfigBuilder(serve.ConfigBuilder):
}
})


def get_parser():
parser = serve.get_parser()
# Added wave specific arguments
Expand Down