From e1edeae83c0519c5865247500b8432ff2ab47dab Mon Sep 17 00:00:00 2001 From: Joe Guo Date: Mon, 30 Jul 2018 18:18:32 +1200 Subject: [PATCH] PEP8: fix E227: missing whitespace around bitwise or shift operator Signed-off-by: Joe Guo Reviewed-by: Andrew Bartlett Reviewed-by: Douglas Bagnall --- python/samba/gpclass.py | 2 +- python/samba/join.py | 4 +- python/samba/netcmd/domain.py | 2 +- python/samba/netcmd/gpo.py | 4 +- python/samba/samdb.py | 2 +- python/samba/upgrade.py | 6 +-- python/samba/upgradehelpers.py | 2 +- source4/dsdb/tests/python/sam.py | 26 +++++------ .../dsdb/tests/python/user_account_control.py | 46 +++++++++---------- 9 files changed, 47 insertions(+), 47 deletions(-) diff --git a/python/samba/gpclass.py b/python/samba/gpclass.py index 07cdff9f212..eb622b1c967 100644 --- a/python/samba/gpclass.py +++ b/python/samba/gpclass.py @@ -260,7 +260,7 @@ class GPOStorage: if os.path.isfile(log_file): self.log = tdb.open(log_file) else: - self.log = tdb.Tdb(log_file, 0, tdb.DEFAULT, os.O_CREAT|os.O_RDWR) + self.log = tdb.Tdb(log_file, 0, tdb.DEFAULT, os.O_CREAT |os.O_RDWR) def start(self): self.log.transaction_start() diff --git a/python/samba/join.py b/python/samba/join.py index 68b2bfc1c68..d5efee57737 100644 --- a/python/samba/join.py +++ b/python/samba/join.py @@ -326,7 +326,7 @@ class DCJoinContext(object): raise Exception("Could not find domain member account '%s' to promote to a DC, use 'samba-tool domain join' instead'" % ctx.samname) if "msDS-krbTgtLink" in res[0] or "serverReferenceBL" in res[0] or "rIDSetReferences" in res[0]: raise Exception("Account '%s' appears to be an active DC, use 'samba-tool domain join' if you must re-create this account" % ctx.samname) - if (int(res[0]["userAccountControl"][0]) & (samba.dsdb.UF_WORKSTATION_TRUST_ACCOUNT|samba.dsdb.UF_SERVER_TRUST_ACCOUNT) == 0): + if (int(res[0]["userAccountControl"][0]) & (samba.dsdb.UF_WORKSTATION_TRUST_ACCOUNT |samba.dsdb.UF_SERVER_TRUST_ACCOUNT) == 0): raise Exception("Account %s is not a domain member or a bare NT4 BDC, use 'samba-tool domain join' instead'" % ctx.samname) ctx.promote_from_dn = res[0].dn @@ -810,7 +810,7 @@ class DCJoinContext(object): "nETBIOSName": ctx.domain_name, "dnsRoot": ctx.dnsdomain, "trustParent": ctx.parent_partition_dn, - "systemFlags": str(samba.dsdb.SYSTEM_FLAG_CR_NTDS_NC|samba.dsdb.SYSTEM_FLAG_CR_NTDS_DOMAIN), + "systemFlags": str(samba.dsdb.SYSTEM_FLAG_CR_NTDS_NC |samba.dsdb.SYSTEM_FLAG_CR_NTDS_DOMAIN), "ntSecurityDescriptor": sd_binary, } diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index 17eef4fe294..19d522064e8 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -902,7 +902,7 @@ class cmd_domain_demote(Command): olduac = uac - uac &= ~(UF_SERVER_TRUST_ACCOUNT|UF_TRUSTED_FOR_DELEGATION|UF_PARTIAL_SECRETS_ACCOUNT) + uac &= ~(UF_SERVER_TRUST_ACCOUNT |UF_TRUSTED_FOR_DELEGATION |UF_PARTIAL_SECRETS_ACCOUNT) uac |= UF_WORKSTATION_TRUST_ACCOUNT msg = ldb.Message() diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py index 75a6ca77d53..c5e322342ad 100644 --- a/python/samba/netcmd/gpo.py +++ b/python/samba/netcmd/gpo.py @@ -144,7 +144,7 @@ def get_gpo_dn(samdb, gpo): def get_gpo_info(samdb, gpo=None, displayname=None, dn=None, - sd_flags=security.SECINFO_OWNER|security.SECINFO_GROUP|security.SECINFO_DACL|security.SECINFO_SACL): + sd_flags=security.SECINFO_OWNER |security.SECINFO_GROUP |security.SECINFO_DACL |security.SECINFO_SACL): '''Get GPO information using gpo, displayname or dn''' policies_dn = samdb.get_default_basedn() @@ -471,7 +471,7 @@ class cmd_list(Command): continue try: - sd_flags = security.SECINFO_OWNER|security.SECINFO_GROUP|security.SECINFO_DACL + sd_flags = security.SECINFO_OWNER |security.SECINFO_GROUP |security.SECINFO_DACL gmsg = self.samdb.search(base=g['dn'], scope=ldb.SCOPE_BASE, attrs=['name', 'displayName', 'flags', 'nTSecurityDescriptor'], diff --git a/python/samba/samdb.py b/python/samba/samdb.py index ae758ac9d4d..2e0ec579f81 100644 --- a/python/samba/samdb.py +++ b/python/samba/samdb.py @@ -394,7 +394,7 @@ member: %s "objectClass": "user"} if smartcard_required: - ldbmessage["userAccountControl"] = str(dsdb.UF_NORMAL_ACCOUNT|dsdb.UF_SMARTCARD_REQUIRED) + ldbmessage["userAccountControl"] = str(dsdb.UF_NORMAL_ACCOUNT |dsdb.UF_SMARTCARD_REQUIRED) setpassword = False if surname is not None: diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py index 69b4e290b76..18c8afd3f1b 100644 --- a/python/samba/upgrade.py +++ b/python/samba/upgrade.py @@ -568,7 +568,7 @@ def upgrade_from_samba3(samba3, logger, targetdir, session_info=None, next_rid = entry['rid'] + 1 user = s3db.getsampwnam(username) - acct_type = (user.acct_ctrl & (samr.ACB_NORMAL|samr.ACB_WSTRUST|samr.ACB_SVRTRUST|samr.ACB_DOMTRUST)) + acct_type = (user.acct_ctrl & (samr.ACB_NORMAL |samr.ACB_WSTRUST |samr.ACB_SVRTRUST |samr.ACB_DOMTRUST)) if acct_type == samr.ACB_SVRTRUST: logger.warn(" Demoting BDC account trust for %s, this DC must be elevated to an AD DC using 'samba-tool domain dcpromo'" % username[:-1]) user.acct_ctrl = (user.acct_ctrl & ~samr.ACB_SVRTRUST) | samr.ACB_WSTRUST @@ -581,11 +581,11 @@ def upgrade_from_samba3(samba3, logger, targetdir, session_info=None, logger.warn(" Skipping account %s that has ACB_WSTRUST (W) set but does not end in $. This account can not have worked, and is probably left over from a misconfiguration." % username) continue - elif acct_type == (samr.ACB_NORMAL|samr.ACB_WSTRUST) and username[-1] == '$': + elif acct_type == (samr.ACB_NORMAL |samr.ACB_WSTRUST) and username[-1] == '$': logger.warn(" Fixing account %s which had both ACB_NORMAL (U) and ACB_WSTRUST (W) set. Account will be marked as ACB_WSTRUST (W), i.e. as a domain member" % username) user.acct_ctrl = (user.acct_ctrl & ~samr.ACB_NORMAL) - elif acct_type == (samr.ACB_NORMAL|samr.ACB_SVRTRUST) and username[-1] == '$': + elif acct_type == (samr.ACB_NORMAL |samr.ACB_SVRTRUST) and username[-1] == '$': logger.warn(" Fixing account %s which had both ACB_NORMAL (U) and ACB_SVRTRUST (S) set. Account will be marked as ACB_WSTRUST (S), i.e. as a domain member" % username) user.acct_ctrl = (user.acct_ctrl & ~samr.ACB_NORMAL) diff --git a/python/samba/upgradehelpers.py b/python/samba/upgradehelpers.py index 2dcedfb2be0..300e59a84e3 100644 --- a/python/samba/upgradehelpers.py +++ b/python/samba/upgradehelpers.py @@ -821,5 +821,5 @@ def int64range2str(value): """ lvalue = long(value) - str = "%d-%d" % (lvalue&0xFFFFFFFF, lvalue>>32) + str = "%d-%d" % (lvalue &0xFFFFFFFF, lvalue >>32) return str diff --git a/source4/dsdb/tests/python/sam.py b/source4/dsdb/tests/python/sam.py index a843c67f244..a1806f9bae3 100755 --- a/source4/dsdb/tests/python/sam.py +++ b/source4/dsdb/tests/python/sam.py @@ -1665,7 +1665,7 @@ class SamTests(samba.tests.TestCase): m = Message() m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn) - m["uac1"] = MessageElement(str(uac|UF_PASSWORD_EXPIRED), + m["uac1"] = MessageElement(str(uac |UF_PASSWORD_EXPIRED), FLAG_MOD_REPLACE, "userAccountControl") ldb.modify(m) @@ -2599,7 +2599,7 @@ class SamTests(samba.tests.TestCase): m = Message() m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn) m["userAccountControl"] = MessageElement( - str(UF_NORMAL_ACCOUNT|UF_SMARTCARD_REQUIRED), + str(UF_NORMAL_ACCOUNT |UF_SMARTCARD_REQUIRED), FLAG_MOD_REPLACE, "userAccountControl") ldb.modify(m) @@ -2612,7 +2612,7 @@ class SamTests(samba.tests.TestCase): self.assertEqual(int(res[0]["sAMAccountType"][0]), ATYPE_NORMAL_ACCOUNT) self.assertEqual(int(res[0]["userAccountControl"][0]), - UF_NORMAL_ACCOUNT|UF_SMARTCARD_REQUIRED) + UF_NORMAL_ACCOUNT |UF_SMARTCARD_REQUIRED) self.assertEqual(int(res[0]["pwdLastSet"][0]), lastset) lastset1 = int(res[0]["pwdLastSet"][0]) self.assertEqual(int(res[0]["msDS-KeyVersionNumber"][0]), 2) @@ -2655,7 +2655,7 @@ class SamTests(samba.tests.TestCase): ldb.add({ "dn": "cn=ldaptestuser,cn=users," + self.base_dn, "objectclass": "user", - "userAccountControl": str(UF_NORMAL_ACCOUNT|UF_ACCOUNTDISABLE), + "userAccountControl": str(UF_NORMAL_ACCOUNT |UF_ACCOUNTDISABLE), }) res = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn, @@ -2667,7 +2667,7 @@ class SamTests(samba.tests.TestCase): self.assertEqual(int(res[0]["sAMAccountType"][0]), ATYPE_NORMAL_ACCOUNT) self.assertEqual(int(res[0]["userAccountControl"][0]), - UF_NORMAL_ACCOUNT|UF_ACCOUNTDISABLE) + UF_NORMAL_ACCOUNT |UF_ACCOUNTDISABLE) self.assertEqual(int(res[0]["pwdLastSet"][0]), 0) self.assertTrue("msDS-KeyVersionNumber" in res[0]) self.assertEqual(int(res[0]["msDS-KeyVersionNumber"][0]), 1) @@ -2701,7 +2701,7 @@ class SamTests(samba.tests.TestCase): m = Message() m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn) m["userAccountControl"] = MessageElement( - str(UF_NORMAL_ACCOUNT|UF_ACCOUNTDISABLE|UF_SMARTCARD_REQUIRED), + str(UF_NORMAL_ACCOUNT |UF_ACCOUNTDISABLE |UF_SMARTCARD_REQUIRED), FLAG_MOD_REPLACE, "userAccountControl") ldb.modify(m) @@ -2714,7 +2714,7 @@ class SamTests(samba.tests.TestCase): self.assertEqual(int(res[0]["sAMAccountType"][0]), ATYPE_NORMAL_ACCOUNT) self.assertEqual(int(res[0]["userAccountControl"][0]), - UF_NORMAL_ACCOUNT|UF_ACCOUNTDISABLE|UF_SMARTCARD_REQUIRED) + UF_NORMAL_ACCOUNT |UF_ACCOUNTDISABLE |UF_SMARTCARD_REQUIRED) self.assertEqual(int(res[0]["pwdLastSet"][0]), 0) self.assertEqual(int(res[0]["msDS-KeyVersionNumber"][0]), 2) self.assertTrue(len(res[0]["replPropertyMetaData"]) == 1) @@ -2748,7 +2748,7 @@ class SamTests(samba.tests.TestCase): m = Message() m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn) m["userAccountControl"] = MessageElement( - str(UF_NORMAL_ACCOUNT|UF_SMARTCARD_REQUIRED), + str(UF_NORMAL_ACCOUNT |UF_SMARTCARD_REQUIRED), FLAG_MOD_REPLACE, "userAccountControl") ldb.modify(m) @@ -2761,7 +2761,7 @@ class SamTests(samba.tests.TestCase): self.assertEqual(int(res[0]["sAMAccountType"][0]), ATYPE_NORMAL_ACCOUNT) self.assertEqual(int(res[0]["userAccountControl"][0]), - UF_NORMAL_ACCOUNT|UF_SMARTCARD_REQUIRED) + UF_NORMAL_ACCOUNT |UF_SMARTCARD_REQUIRED) self.assertEqual(int(res[0]["pwdLastSet"][0]), 0) self.assertEqual(int(res[0]["msDS-KeyVersionNumber"][0]), 2) self.assertTrue(len(res[0]["replPropertyMetaData"]) == 1) @@ -2803,7 +2803,7 @@ class SamTests(samba.tests.TestCase): ldb.add({ "dn": "cn=ldaptestuser,cn=users," + self.base_dn, "objectclass": "user", - "userAccountControl": str(UF_NORMAL_ACCOUNT|UF_SMARTCARD_REQUIRED|UF_ACCOUNTDISABLE), + "userAccountControl": str(UF_NORMAL_ACCOUNT |UF_SMARTCARD_REQUIRED |UF_ACCOUNTDISABLE), }) res = ldb.search("cn=ldaptestuser,cn=users," + self.base_dn, @@ -2815,7 +2815,7 @@ class SamTests(samba.tests.TestCase): self.assertEqual(int(res[0]["sAMAccountType"][0]), ATYPE_NORMAL_ACCOUNT) self.assertEqual(int(res[0]["userAccountControl"][0]), - UF_NORMAL_ACCOUNT|UF_SMARTCARD_REQUIRED|UF_ACCOUNTDISABLE) + UF_NORMAL_ACCOUNT |UF_SMARTCARD_REQUIRED |UF_ACCOUNTDISABLE) self.assertEqual(int(res[0]["pwdLastSet"][0]), 0) self.assertEqual(int(res[0]["msDS-KeyVersionNumber"][0]), 1) self.assertTrue(len(res[0]["replPropertyMetaData"]) == 1) @@ -2849,7 +2849,7 @@ class SamTests(samba.tests.TestCase): m = Message() m.dn = Dn(ldb, "cn=ldaptestuser,cn=users," + self.base_dn) m["userAccountControl"] = MessageElement( - str(UF_NORMAL_ACCOUNT|UF_SMARTCARD_REQUIRED), + str(UF_NORMAL_ACCOUNT |UF_SMARTCARD_REQUIRED), FLAG_MOD_REPLACE, "userAccountControl") ldb.modify(m) @@ -2862,7 +2862,7 @@ class SamTests(samba.tests.TestCase): self.assertEqual(int(res[0]["sAMAccountType"][0]), ATYPE_NORMAL_ACCOUNT) self.assertEqual(int(res[0]["userAccountControl"][0]), - UF_NORMAL_ACCOUNT|UF_SMARTCARD_REQUIRED) + UF_NORMAL_ACCOUNT |UF_SMARTCARD_REQUIRED) self.assertEqual(int(res[0]["pwdLastSet"][0]), 0) self.assertEqual(int(res[0]["msDS-KeyVersionNumber"][0]), 1) self.assertTrue(len(res[0]["replPropertyMetaData"]) == 1) diff --git a/source4/dsdb/tests/python/user_account_control.py b/source4/dsdb/tests/python/user_account_control.py index 29f5c9ffa24..c60e0854344 100755 --- a/source4/dsdb/tests/python/user_account_control.py +++ b/source4/dsdb/tests/python/user_account_control.py @@ -234,7 +234,7 @@ class UserAccountControlTests(samba.tests.TestCase): m = ldb.Message() m.dn = res[0].dn - m["userAccountControl"] = ldb.MessageElement(str(samba.dsdb.UF_WORKSTATION_TRUST_ACCOUNT|samba.dsdb.UF_PARTIAL_SECRETS_ACCOUNT), + m["userAccountControl"] = ldb.MessageElement(str(samba.dsdb.UF_WORKSTATION_TRUST_ACCOUNT |samba.dsdb.UF_PARTIAL_SECRETS_ACCOUNT), ldb.FLAG_MOD_REPLACE, "userAccountControl") try: self.samdb.modify(m) @@ -297,7 +297,7 @@ class UserAccountControlTests(samba.tests.TestCase): m = ldb.Message() m.dn = res[0].dn - m["userAccountControl"] = ldb.MessageElement(str(samba.dsdb.UF_WORKSTATION_TRUST_ACCOUNT|samba.dsdb.UF_PARTIAL_SECRETS_ACCOUNT), + m["userAccountControl"] = ldb.MessageElement(str(samba.dsdb.UF_WORKSTATION_TRUST_ACCOUNT |samba.dsdb.UF_PARTIAL_SECRETS_ACCOUNT), ldb.FLAG_MOD_REPLACE, "userAccountControl") try: self.samdb.modify(m) @@ -344,11 +344,11 @@ class UserAccountControlTests(samba.tests.TestCase): scope=SCOPE_SUBTREE, attrs=["userAccountControl"]) - self.assertEqual(int(res[0]["userAccountControl"][0]), UF_NORMAL_ACCOUNT|UF_ACCOUNTDISABLE|UF_PASSWD_NOTREQD) + self.assertEqual(int(res[0]["userAccountControl"][0]), UF_NORMAL_ACCOUNT |UF_ACCOUNTDISABLE |UF_PASSWD_NOTREQD) m = ldb.Message() m.dn = res[0].dn - m["userAccountControl"] = ldb.MessageElement(str(UF_WORKSTATION_TRUST_ACCOUNT|UF_PARTIAL_SECRETS_ACCOUNT|UF_TRUSTED_FOR_DELEGATION), + m["userAccountControl"] = ldb.MessageElement(str(UF_WORKSTATION_TRUST_ACCOUNT |UF_PARTIAL_SECRETS_ACCOUNT |UF_TRUSTED_FOR_DELEGATION), ldb.FLAG_MOD_REPLACE, "userAccountControl") try: self.admin_samdb.modify(m) @@ -359,7 +359,7 @@ class UserAccountControlTests(samba.tests.TestCase): m = ldb.Message() m.dn = res[0].dn - m["userAccountControl"] = ldb.MessageElement(str(UF_WORKSTATION_TRUST_ACCOUNT|UF_PARTIAL_SECRETS_ACCOUNT), + m["userAccountControl"] = ldb.MessageElement(str(UF_WORKSTATION_TRUST_ACCOUNT |UF_PARTIAL_SECRETS_ACCOUNT), ldb.FLAG_MOD_REPLACE, "userAccountControl") self.admin_samdb.modify(m) @@ -368,7 +368,7 @@ class UserAccountControlTests(samba.tests.TestCase): scope=SCOPE_SUBTREE, attrs=["userAccountControl"]) - self.assertEqual(int(res[0]["userAccountControl"][0]), UF_WORKSTATION_TRUST_ACCOUNT|UF_PARTIAL_SECRETS_ACCOUNT) + self.assertEqual(int(res[0]["userAccountControl"][0]), UF_WORKSTATION_TRUST_ACCOUNT |UF_PARTIAL_SECRETS_ACCOUNT) m = ldb.Message() m.dn = res[0].dn m["userAccountControl"] = ldb.MessageElement(str(UF_ACCOUNTDISABLE), @@ -420,7 +420,7 @@ class UserAccountControlTests(samba.tests.TestCase): for bit in bits: m = ldb.Message() m.dn = res[0].dn - m["userAccountControl"] = ldb.MessageElement(str(bit|UF_PASSWD_NOTREQD), + m["userAccountControl"] = ldb.MessageElement(str(bit |UF_PASSWD_NOTREQD), ldb.FLAG_MOD_REPLACE, "userAccountControl") try: self.samdb.modify(m) @@ -495,7 +495,7 @@ class UserAccountControlTests(samba.tests.TestCase): m = ldb.Message() m.dn = res[0].dn - m["userAccountControl"] = ldb.MessageElement(str(bit|UF_PASSWD_NOTREQD), + m["userAccountControl"] = ldb.MessageElement(str(bit |UF_PASSWD_NOTREQD), ldb.FLAG_MOD_REPLACE, "userAccountControl") try: self.admin_samdb.modify(m) @@ -521,17 +521,17 @@ class UserAccountControlTests(samba.tests.TestCase): attrs=["userAccountControl"]) if bit in ignored_bits: - self.assertEqual(int(res[0]["userAccountControl"][0]), UF_NORMAL_ACCOUNT|UF_PASSWD_NOTREQD, "Bit 0x%08x shouldn't stick" % bit) + self.assertEqual(int(res[0]["userAccountControl"][0]), UF_NORMAL_ACCOUNT |UF_PASSWD_NOTREQD, "Bit 0x%08x shouldn't stick" % bit) else: if bit in account_types: - self.assertEqual(int(res[0]["userAccountControl"][0]), bit|UF_PASSWD_NOTREQD, "Bit 0x%08x didn't stick" % bit) + self.assertEqual(int(res[0]["userAccountControl"][0]), bit |UF_PASSWD_NOTREQD, "Bit 0x%08x didn't stick" % bit) else: - self.assertEqual(int(res[0]["userAccountControl"][0]), bit|UF_NORMAL_ACCOUNT|UF_PASSWD_NOTREQD, "Bit 0x%08x didn't stick" % bit) + self.assertEqual(int(res[0]["userAccountControl"][0]), bit |UF_NORMAL_ACCOUNT |UF_PASSWD_NOTREQD, "Bit 0x%08x didn't stick" % bit) try: m = ldb.Message() m.dn = res[0].dn - m["userAccountControl"] = ldb.MessageElement(str(bit|UF_PASSWD_NOTREQD|UF_ACCOUNTDISABLE), + m["userAccountControl"] = ldb.MessageElement(str(bit |UF_PASSWD_NOTREQD |UF_ACCOUNTDISABLE), ldb.FLAG_MOD_REPLACE, "userAccountControl") self.samdb.modify(m) @@ -546,28 +546,28 @@ class UserAccountControlTests(samba.tests.TestCase): if bit in account_types: self.assertEqual(int(res[0]["userAccountControl"][0]), - bit|UF_ACCOUNTDISABLE|UF_PASSWD_NOTREQD, + bit |UF_ACCOUNTDISABLE |UF_PASSWD_NOTREQD, "bit 0X%08x should have been added (0X%08x vs 0X%08x)" % (bit, int(res[0]["userAccountControl"][0]), - bit|UF_ACCOUNTDISABLE|UF_PASSWD_NOTREQD)) + bit |UF_ACCOUNTDISABLE |UF_PASSWD_NOTREQD)) elif bit in ignored_bits: self.assertEqual(int(res[0]["userAccountControl"][0]), - UF_NORMAL_ACCOUNT|UF_ACCOUNTDISABLE|UF_PASSWD_NOTREQD, + UF_NORMAL_ACCOUNT |UF_ACCOUNTDISABLE |UF_PASSWD_NOTREQD, "bit 0X%08x should have been added (0X%08x vs 0X%08x)" % (bit, int(res[0]["userAccountControl"][0]), - UF_NORMAL_ACCOUNT|UF_ACCOUNTDISABLE|UF_PASSWD_NOTREQD)) + UF_NORMAL_ACCOUNT |UF_ACCOUNTDISABLE |UF_PASSWD_NOTREQD)) else: self.assertEqual(int(res[0]["userAccountControl"][0]), - bit|UF_NORMAL_ACCOUNT|UF_ACCOUNTDISABLE|UF_PASSWD_NOTREQD, + bit |UF_NORMAL_ACCOUNT |UF_ACCOUNTDISABLE |UF_PASSWD_NOTREQD, "bit 0X%08x should have been added (0X%08x vs 0X%08x)" % (bit, int(res[0]["userAccountControl"][0]), - bit|UF_NORMAL_ACCOUNT|UF_ACCOUNTDISABLE|UF_PASSWD_NOTREQD)) + bit |UF_NORMAL_ACCOUNT |UF_ACCOUNTDISABLE |UF_PASSWD_NOTREQD)) try: m = ldb.Message() m.dn = res[0].dn - m["userAccountControl"] = ldb.MessageElement(str(UF_PASSWD_NOTREQD|UF_ACCOUNTDISABLE), + m["userAccountControl"] = ldb.MessageElement(str(UF_PASSWD_NOTREQD |UF_ACCOUNTDISABLE), ldb.FLAG_MOD_REPLACE, "userAccountControl") self.samdb.modify(m) if bit in priv_to_remove_bits: @@ -588,15 +588,15 @@ class UserAccountControlTests(samba.tests.TestCase): if bit in priv_to_remove_bits: if bit in account_types: self.assertEqual(int(res[0]["userAccountControl"][0]), - bit|UF_ACCOUNTDISABLE|UF_PASSWD_NOTREQD, + bit |UF_ACCOUNTDISABLE |UF_PASSWD_NOTREQD, "bit 0X%08x should not have been removed" % bit) else: self.assertEqual(int(res[0]["userAccountControl"][0]), - bit|UF_NORMAL_ACCOUNT|UF_ACCOUNTDISABLE|UF_PASSWD_NOTREQD, + bit |UF_NORMAL_ACCOUNT |UF_ACCOUNTDISABLE |UF_PASSWD_NOTREQD, "bit 0X%08x should not have been removed" % bit) else: self.assertEqual(int(res[0]["userAccountControl"][0]), - UF_NORMAL_ACCOUNT|UF_ACCOUNTDISABLE|UF_PASSWD_NOTREQD, + UF_NORMAL_ACCOUNT |UF_ACCOUNTDISABLE |UF_PASSWD_NOTREQD, "bit 0X%08x should have been removed" % bit) def test_uac_bits_unrelated_modify_normal(self): @@ -699,7 +699,7 @@ class UserAccountControlTests(samba.tests.TestCase): computername = self.computernames[0] self.add_computer_ldap(computername, - others={"userAccountControl": [str(UF_WORKSTATION_TRUST_ACCOUNT|UF_PARTIAL_SECRETS_ACCOUNT)]}, + others={"userAccountControl": [str(UF_WORKSTATION_TRUST_ACCOUNT |UF_PARTIAL_SECRETS_ACCOUNT)]}, samdb=self.admin_samdb) res = self.admin_samdb.search("%s" % self.base_dn, expression="(&(objectClass=computer)(samAccountName=%s$))" % computername,