From 4f3d7bf6ada0aed40940a4623abfb0fb1159254d Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Wed, 25 Dec 2024 12:22:55 +0000 Subject: [PATCH] BUILDBOT: Fix deprecations --- buildbot-config/utils/discord.py | 4 ++-- buildbot-config/utils/list_daily_builds/__init__.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/buildbot-config/utils/discord.py b/buildbot-config/utils/discord.py index c8d4957..8195952 100644 --- a/buildbot-config/utils/discord.py +++ b/buildbot-config/utils/discord.py @@ -151,8 +151,8 @@ class DiscordStatusPush(ReporterBase): yield super().reconfigService(generators=generators, **kwargs) - self._http = yield httpclientservice.HTTPClientService.getService( - self.master, webhook_url, + self._http = yield httpclientservice.HTTPSession( + self.master.httpservice, webhook_url, debug=debug, verify=verify) def _create_default_generators(self): diff --git a/buildbot-config/utils/list_daily_builds/__init__.py b/buildbot-config/utils/list_daily_builds/__init__.py index 5ab4071..56a5a05 100644 --- a/buildbot-config/utils/list_daily_builds/__init__.py +++ b/buildbot-config/utils/list_daily_builds/__init__.py @@ -49,7 +49,10 @@ def get_application( daily_builds_dir, daily_builds_url, helpers, builds, platforms) - app = ConfiguredBottle(catchall=False, autojson=False) + app = ConfiguredBottle() + app.catchall = False + # There seems to be no other way to disable autojson on Bottle v0.13 + app.uninstall(bottle.JSONPlugin) app.helpers = helpers app.packaged_builds = packaged_builds