From c9512a18537935ed44e798602920c18629125994 Mon Sep 17 00:00:00 2001 From: twangboy Date: Fri, 14 Jul 2023 09:05:10 -0600 Subject: [PATCH] Fix pre-commit --- salt/utils/user.py | 6 +++--- tests/pytests/functional/utils/user/test_get_group_dict.py | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/salt/utils/user.py b/salt/utils/user.py index 2f1ca65cf99..b47456a7361 100644 --- a/salt/utils/user.py +++ b/salt/utils/user.py @@ -158,13 +158,13 @@ def get_specific_user(): user = get_user() if salt.utils.platform.is_windows(): if _win_current_user_is_admin(): - return "sudo_{}".format(user) + return f"sudo_{user}" else: env_vars = ("SUDO_USER",) if user == "root": for evar in env_vars: if evar in os.environ: - return "sudo_{}".format(os.environ[evar]) + return f"sudo_{os.environ[evar]}" return user @@ -182,7 +182,7 @@ def chugid(runas, group=None): target_pw_gid = grp.getgrnam(group).gr_gid except KeyError as err: raise CommandExecutionError( - "Failed to fetch the GID for {}. Error: {}".format(group, err) + f"Failed to fetch the GID for {group}. Error: {err}" ) else: target_pw_gid = uinfo.pw_gid diff --git a/tests/pytests/functional/utils/user/test_get_group_dict.py b/tests/pytests/functional/utils/user/test_get_group_dict.py index 653d664607f..ff70db4511b 100644 --- a/tests/pytests/functional/utils/user/test_get_group_dict.py +++ b/tests/pytests/functional/utils/user/test_get_group_dict.py @@ -9,7 +9,9 @@ from tests.support.mock import patch log = logging.getLogger(__name__) pytestmark = [ - pytest.mark.skip_unless_on_linux(reason="Should only run in platforms which have duplicate GID support"), + pytest.mark.skip_unless_on_linux( + reason="Should only run in platforms which have duplicate GID support" + ), ] def test_get_group_dict_with_improper_duplicate_root_group(): with patch("salt.utils.user.get_group_list", return_value=["+", "root"]):