From 9853bd69eb2fe28a122431e497b09fc881dedc1e Mon Sep 17 00:00:00 2001 From: Jo Sutton Date: Tue, 2 Jul 2024 14:55:45 +1200 Subject: [PATCH] tests/krb5: Simplify code using dict.get() Signed-off-by: Jo Sutton Reviewed-by: Martin Schwenke --- python/samba/tests/krb5/pkinit_tests.py | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/python/samba/tests/krb5/pkinit_tests.py b/python/samba/tests/krb5/pkinit_tests.py index 4783b125c95..dbd158b2dc2 100755 --- a/python/samba/tests/krb5/pkinit_tests.py +++ b/python/samba/tests/krb5/pkinit_tests.py @@ -626,10 +626,7 @@ class PkInitTests(KDCBaseTest): attrs=["msDS-ExpirePasswordsOnSmartCardOnlyAccounts"]) msg = msgs[0] - try: - old_ExpirePasswordsOnSmartCardOnlyAccounts = msg["msDS-ExpirePasswordsOnSmartCardOnlyAccounts"] - except KeyError: - old_ExpirePasswordsOnSmartCardOnlyAccounts = None + old_ExpirePasswordsOnSmartCardOnlyAccounts = msg.get("msDS-ExpirePasswordsOnSmartCardOnlyAccounts") self.addCleanup(set_ExpirePasswordsOnSmartCardOnlyAccounts, samdb, old_ExpirePasswordsOnSmartCardOnlyAccounts) @@ -752,10 +749,7 @@ class PkInitTests(KDCBaseTest): attrs=["msDS-ExpirePasswordsOnSmartCardOnlyAccounts"]) msg = msgs[0] - try: - old_ExpirePasswordsOnSmartCardOnlyAccounts = msg["msDS-ExpirePasswordsOnSmartCardOnlyAccounts"] - except KeyError: - old_ExpirePasswordsOnSmartCardOnlyAccounts = None + old_ExpirePasswordsOnSmartCardOnlyAccounts = msg.get("msDS-ExpirePasswordsOnSmartCardOnlyAccounts") self.addCleanup(set_ExpirePasswordsOnSmartCardOnlyAccounts, samdb, old_ExpirePasswordsOnSmartCardOnlyAccounts) @@ -834,10 +828,7 @@ class PkInitTests(KDCBaseTest): attrs=["msDS-ExpirePasswordsOnSmartCardOnlyAccounts"]) msg = msgs[0] - try: - old_ExpirePasswordsOnSmartCardOnlyAccounts = msg["msDS-ExpirePasswordsOnSmartCardOnlyAccounts"] - except KeyError: - old_ExpirePasswordsOnSmartCardOnlyAccounts = None + old_ExpirePasswordsOnSmartCardOnlyAccounts = msg.get("msDS-ExpirePasswordsOnSmartCardOnlyAccounts") self.addCleanup(set_ExpirePasswordsOnSmartCardOnlyAccounts, samdb, old_ExpirePasswordsOnSmartCardOnlyAccounts) @@ -1025,10 +1016,7 @@ class PkInitTests(KDCBaseTest): attrs=["msDS-ExpirePasswordsOnSmartCardOnlyAccounts"]) msg = msgs[0] - try: - old_ExpirePasswordsOnSmartCardOnlyAccounts = msg["msDS-ExpirePasswordsOnSmartCardOnlyAccounts"] - except KeyError: - old_ExpirePasswordsOnSmartCardOnlyAccounts = None + old_ExpirePasswordsOnSmartCardOnlyAccounts = msg.get("msDS-ExpirePasswordsOnSmartCardOnlyAccounts") self.addCleanup(set_ExpirePasswordsOnSmartCardOnlyAccounts, samdb, old_ExpirePasswordsOnSmartCardOnlyAccounts) @@ -1117,10 +1105,7 @@ class PkInitTests(KDCBaseTest): attrs=["msDS-ExpirePasswordsOnSmartCardOnlyAccounts"]) msg = msgs[0] - try: - old_ExpirePasswordsOnSmartCardOnlyAccounts = msg["msDS-ExpirePasswordsOnSmartCardOnlyAccounts"] - except KeyError: - old_ExpirePasswordsOnSmartCardOnlyAccounts = None + old_ExpirePasswordsOnSmartCardOnlyAccounts = msg.get("msDS-ExpirePasswordsOnSmartCardOnlyAccounts") self.addCleanup(set_ExpirePasswordsOnSmartCardOnlyAccounts, samdb, old_ExpirePasswordsOnSmartCardOnlyAccounts) -- 2.47.2