tests/krb5: Simplify code using dict.get()

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/python/samba/tests/krb5/pkinit_tests.py b/python/samba/tests/krb5/pkinit_tests.py
index 4783b125c959bacb51328b274dc93db6b2e9b9e1..dbd158b2dc2e4306cc65ec2507c72271925505f1 100755 (executable)
--- 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)