From 2cd1cf265905973aa579a0f63924ee3543a69298 Mon Sep 17 00:00:00 2001 From: Olivier Gayot Date: Tue, 5 Apr 2022 10:05:02 +0200 Subject: [PATCH] Avoid redefining types NetworkModel & LogHandler Signed-off-by: Olivier Gayot --- subiquity/models/network.py | 4 ++-- subiquity/server/controllers/reporting.py | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/subiquity/models/network.py b/subiquity/models/network.py index c1805344..032d553e 100644 --- a/subiquity/models/network.py +++ b/subiquity/models/network.py @@ -15,12 +15,12 @@ import logging -from subiquitycore.models.network import NetworkModel +from subiquitycore.models.network import NetworkModel as CoreNetworkModel log = logging.getLogger('subiquity.models.network') -class NetworkModel(NetworkModel): +class NetworkModel(CoreNetworkModel): def __init__(self): super().__init__("subiquity") diff --git a/subiquity/server/controllers/reporting.py b/subiquity/server/controllers/reporting.py index 652b759d..7cf1b2de 100644 --- a/subiquity/server/controllers/reporting.py +++ b/subiquity/server/controllers/reporting.py @@ -25,14 +25,12 @@ from curtin.reporter.events import ( report_start_event, status, ) -from curtin.reporter.handlers import ( - LogHandler, - ) +from curtin.reporter.handlers import LogHandler as CurtinLogHandler from subiquity.server.controller import NonInteractiveController -class LogHandler(LogHandler): +class LogHandler(CurtinLogHandler): def publish_event(self, event): level = getattr(logging, event.level) logger = logging.getLogger('')