From a098738a2d248d78a3c07b6cdf5317a4d1ffbb54 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Wed, 9 Mar 2022 21:13:03 +0100 Subject: [PATCH] Make the linter happy --- .../opensshconfigscanner/libraries/readopensshconfig.py | 3 +-- .../tests/test_readopensshconfig_opensshconfigscanner.py | 3 +-- .../el7toel8/actors/opensshpermitrootlogincheck/actor.py | 7 +++---- repos/system_upgrade/el7toel8/models/opensshconfig.py | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/repos/system_upgrade/el7toel8/actors/opensshconfigscanner/libraries/readopensshconfig.py b/repos/system_upgrade/el7toel8/actors/opensshconfigscanner/libraries/readopensshconfig.py index a469fcc32c..3b70486a02 100644 --- a/repos/system_upgrade/el7toel8/actors/opensshconfigscanner/libraries/readopensshconfig.py +++ b/repos/system_upgrade/el7toel8/actors/opensshconfigscanner/libraries/readopensshconfig.py @@ -1,8 +1,7 @@ import errno +from leapp.libraries.stdlib import api, run from leapp.models import OpenSshConfig, OpenSshPermitRootLogin -from leapp.libraries.stdlib import run, api - CONFIG = '/etc/ssh/sshd_config' DEPRECATED_DIRECTIVES = ['showpatchlevel'] diff --git a/repos/system_upgrade/el7toel8/actors/opensshconfigscanner/tests/test_readopensshconfig_opensshconfigscanner.py b/repos/system_upgrade/el7toel8/actors/opensshconfigscanner/tests/test_readopensshconfig_opensshconfigscanner.py index 66de56debc..8fa5837b74 100644 --- a/repos/system_upgrade/el7toel8/actors/opensshconfigscanner/tests/test_readopensshconfig_opensshconfigscanner.py +++ b/repos/system_upgrade/el7toel8/actors/opensshconfigscanner/tests/test_readopensshconfig_opensshconfigscanner.py @@ -1,6 +1,5 @@ +from leapp.libraries.actor.readopensshconfig import line_empty, parse_config, parse_config_modification, produce_config from leapp.models import OpenSshConfig, OpenSshPermitRootLogin -from leapp.libraries.actor.readopensshconfig import parse_config, \ - produce_config, line_empty, parse_config_modification def test_line_empty(): diff --git a/repos/system_upgrade/el7toel8/actors/opensshpermitrootlogincheck/actor.py b/repos/system_upgrade/el7toel8/actors/opensshpermitrootlogincheck/actor.py index 91a2b3c941..f13a767267 100644 --- a/repos/system_upgrade/el7toel8/actors/opensshpermitrootlogincheck/actor.py +++ b/repos/system_upgrade/el7toel8/actors/opensshpermitrootlogincheck/actor.py @@ -1,12 +1,11 @@ +from leapp import reporting from leapp.actors import Actor from leapp.exceptions import StopActorExecutionError from leapp.libraries.actor.opensshpermitrootlogincheck import semantics_changes -from leapp.models import Report, OpenSshConfig -from leapp.tags import ChecksPhaseTag, IPUWorkflowTag from leapp.libraries.stdlib import api +from leapp.models import OpenSshConfig, Report from leapp.reporting import create_report -from leapp import reporting - +from leapp.tags import ChecksPhaseTag, IPUWorkflowTag COMMON_REPORT_TAGS = [ reporting.Tags.AUTHENTICATION, diff --git a/repos/system_upgrade/el7toel8/models/opensshconfig.py b/repos/system_upgrade/el7toel8/models/opensshconfig.py index 9541a4e98e..934c9da356 100644 --- a/repos/system_upgrade/el7toel8/models/opensshconfig.py +++ b/repos/system_upgrade/el7toel8/models/opensshconfig.py @@ -1,4 +1,4 @@ -from leapp.models import Model, fields +from leapp.models import fields, Model from leapp.topics import SystemInfoTopic