PEP8: fix E225: missing whitespace around operator

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

17 files changed, 97 insertions, 97 deletions

diff --git a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
index 27b3ad59d5b..24dcb1c321a 100755
--- a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
+++ b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
@@ -81,7 +81,7 @@ def possible_inferiors_search(db, oc):
                     expression=("ldapDisplayName=%s" % oc),
                     attrs=["possibleInferiors"])
 
-    poss=[]
+    poss = []
     if len(res) == 0 or res[0].get("possibleInferiors") is None:
         return poss
     for item in res[0]["possibleInferiors"]:
@@ -240,7 +240,7 @@ def test_class(db, classinfo, oc):
 
 def get_object_classes(db):
     """return a list of all object classes"""
-    list=[]
+    list = []
     for item in classinfo:
         list.append(item)
     return list
diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py
index f2f87bc765e..4e479ce8b17 100755
--- a/source4/dsdb/tests/python/acl.py
+++ b/source4/dsdb/tests/python/acl.py
@@ -1774,7 +1774,7 @@ class AclUndeleteTests(AclTests):
         self.testuser5 = "to_be_undeleted5"
         self.testuser6 = "to_be_undeleted6"
 
-        self.new_dn_ou = "CN="+ self.testuser4 + "," + self.ou1 + self.base_dn
+        self.new_dn_ou = "CN=" + self.testuser4 + "," + self.ou1 + self.base_dn
 
         # Create regular user
         self.testuser1_dn = self.get_user_dn(self.testuser1)
diff --git a/source4/dsdb/tests/python/deletetest.py b/source4/dsdb/tests/python/deletetest.py
index 4cf3da7c430..9edeb2f782f 100755
--- a/source4/dsdb/tests/python/deletetest.py
+++ b/source4/dsdb/tests/python/deletetest.py
@@ -104,11 +104,11 @@ class BasicDeleteTests(BaseDeleteTests):
 
     def check_rdn(self, liveObj, delObj, rdnName):
         print("Checking for correct rDN")
-        rdn=liveObj[rdnName][0]
-        rdn2=delObj[rdnName][0]
-        name2=delObj["name"][0]
-        dn_rdn=delObj.dn.get_rdn_value()
-        guid=liveObj["objectGUID"][0]
+        rdn = liveObj[rdnName][0]
+        rdn2 = delObj[rdnName][0]
+        name2 = delObj["name"][0]
+        dn_rdn = delObj.dn.get_rdn_value()
+        guid = liveObj["objectGUID"][0]
         self.assertEquals(rdn2, rdn + "\nDEL:" + self.GUID_string(guid))
         self.assertEquals(name2, rdn + "\nDEL:" + self.GUID_string(guid))
         self.assertEquals(name2, dn_rdn)
@@ -336,25 +336,25 @@ class BasicTreeDeleteTests(BasicDeleteTests):
             "objectClass": "server"})
 
         self.objLive1 = self.search_dn(self.usr1)
-        self.guid1=self.objLive1["objectGUID"][0]
+        self.guid1 = self.objLive1["objectGUID"][0]
 
         self.objLive2 = self.search_dn(self.usr2)
-        self.guid2=self.objLive2["objectGUID"][0]
+        self.guid2 = self.objLive2["objectGUID"][0]
 
         self.objLive3 = self.search_dn(self.grp1)
-        self.guid3=self.objLive3["objectGUID"][0]
+        self.guid3 = self.objLive3["objectGUID"][0]
 
         self.objLive4 = self.search_dn(self.sit1)
-        self.guid4=self.objLive4["objectGUID"][0]
+        self.guid4 = self.objLive4["objectGUID"][0]
 
         self.objLive5 = self.search_dn(self.ss1)
-        self.guid5=self.objLive5["objectGUID"][0]
+        self.guid5 = self.objLive5["objectGUID"][0]
 
         self.objLive6 = self.search_dn(self.srv1)
-        self.guid6=self.objLive6["objectGUID"][0]
+        self.guid6 = self.objLive6["objectGUID"][0]
 
         self.objLive7 = self.search_dn(self.srv2)
-        self.guid7=self.objLive7["objectGUID"][0]
+        self.guid7 = self.objLive7["objectGUID"][0]
 
         self.deleted_objects_config_dn \
             = self.ldb.get_wellknown_dn(self.ldb.get_config_basedn(),
diff --git a/source4/dsdb/tests/python/dirsync.py b/source4/dsdb/tests/python/dirsync.py
index ae36a5157c7..54ede529d96 100755
--- a/source4/dsdb/tests/python/dirsync.py
+++ b/source4/dsdb/tests/python/dirsync.py
@@ -295,7 +295,7 @@ class SimpleDirsyncTests(DirsyncBaseTests):
                                     attrs=["parentGUID"],
                                     controls=["dirsync:1:0:1"])
         self.assertEqual(len(res.msgs), 0)
-        ouname="OU=testou,%s" % self.base_dn
+        ouname = "OU=testou,%s" % self.base_dn
         self.ouname = ouname
         self.ldb_admin.create_ou(ouname)
         delta = Message()
@@ -399,7 +399,7 @@ class SimpleDirsyncTests(DirsyncBaseTests):
         control2 = str(":".join(ctl))
 
         # Let's create an OU
-        ouname="OU=testou2,%s" % self.base_dn
+        ouname = "OU=testou2,%s" % self.base_dn
         self.ouname = ouname
         self.ldb_admin.create_ou(ouname)
         res = self.ldb_admin.search(self.base_dn,
@@ -545,7 +545,7 @@ class SimpleDirsyncTests(DirsyncBaseTests):
     def test_dirsync_deleted_items(self):
         """Check that dirsync returnd deleted objects too"""
         # Let's create an OU
-        ouname="OU=testou3,%s" % self.base_dn
+        ouname = "OU=testou3,%s" % self.base_dn
         self.ouname = ouname
         self.ldb_admin.create_ou(ouname)
         res = self.ldb_admin.search(self.base_dn,
@@ -582,7 +582,7 @@ class SimpleDirsyncTests(DirsyncBaseTests):
         ctl = str(res.controls[0]).split(":")
         cookie = ndr_unpack(drsblobs.ldapControlDirSyncCookie, base64.b64decode(str(ctl[4])))
         cookie.blob.guid1 = misc.GUID("128a99bf-abcd-1234-abcd-1fb625e530db")
-        controls=["dirsync:1:0:0:%s" % base64.b64encode(ndr_pack(cookie)).decode('utf8')]
+        controls = ["dirsync:1:0:0:%s" % base64.b64encode(ndr_pack(cookie)).decode('utf8')]
         res = self.ldb_admin.search(self.base_dn,
                                     expression="(&(objectClass=organizationalUnit)(!(isDeleted=*)))",
                                     controls=controls)
@@ -662,7 +662,7 @@ class ExtendedDirsyncTests(SimpleDirsyncTests):
         """Check that dirsync returnd deleted objects too"""
         # Let's create an OU
         self.ldb_simple = self.get_ldb_connection(self.simple_user, self.user_pass)
-        ouname="OU=testou3,%s" % self.base_dn
+        ouname = "OU=testou3,%s" % self.base_dn
         self.ouname = ouname
         self.ldb_admin.create_ou(ouname)
 
diff --git a/source4/dsdb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py
index e50eb5c03b1..62f00547019 100755
--- a/source4/dsdb/tests/python/ldap.py
+++ b/source4/dsdb/tests/python/ldap.py
@@ -2788,19 +2788,19 @@ gidNumber: 10126
 homeDirectory: /home/posixuser
 loginShell: /bin/bash
 gecos: Posix User;;;
-description: A POSIX user"""% (self.base_dn))
+description: A POSIX user""" % (self.base_dn))
 
         # Testing removing the posixAccount objectClass from an existing user"
         self.ldb.modify_ldif("""dn: cn=posixuser,CN=Users,%s
 changetype: modify
 delete: objectClass
-objectClass: posixAccount"""% (self.base_dn))
+objectClass: posixAccount""" % (self.base_dn))
 
         # Testing adding the posixAccount objectClass to an existing user"
         self.ldb.modify_ldif("""dn: cn=posixuser,CN=Users,%s
 changetype: modify
 add: objectClass
-objectClass: posixAccount"""% (self.base_dn))
+objectClass: posixAccount""" % (self.base_dn))
 
         delete_force(self.ldb, "cn=posixuser,cn=users," + self.base_dn)
         delete_force(self.ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
diff --git a/source4/dsdb/tests/python/ldap_schema.py b/source4/dsdb/tests/python/ldap_schema.py
index f60f36d3e00..bd889325ad3 100755
--- a/source4/dsdb/tests/python/ldap_schema.py
+++ b/source4/dsdb/tests/python/ldap_schema.py
@@ -210,15 +210,15 @@ schemaUpdateNow: 1
         object_name = "obj" + time.strftime("%s", time.gmtime())
 
         ldif = """
-dn: CN=%s,CN=Users,%s"""% (object_name, self.base_dn) + """
+dn: CN=%s,CN=Users,%s""" % (object_name, self.base_dn) + """
 objectClass: organizationalPerson
 objectClass: person
 objectClass: """ + class_ldap_display_name + """
 objectClass: top
 cn: """ + object_name + """
 instanceType: 4
-objectCategory: CN=%s,%s"""% (class_name, self.schema_dn) + """
-distinguishedName: CN=%s,CN=Users,%s"""% (object_name, self.base_dn) + """
+objectCategory: CN=%s,%s""" % (class_name, self.schema_dn) + """
+distinguishedName: CN=%s,CN=Users,%s""" % (object_name, self.base_dn) + """
 name: """ + object_name + """
 """ + attr_ldap_display_name + """: test
 """
diff --git a/source4/dsdb/tests/python/ldap_syntaxes.py b/source4/dsdb/tests/python/ldap_syntaxes.py
index 2877f1cfd25..ab6bc7c9b60 100755
--- a/source4/dsdb/tests/python/ldap_syntaxes.py
+++ b/source4/dsdb/tests/python/ldap_syntaxes.py
@@ -177,15 +177,15 @@ systemOnly: FALSE
     def _get_object_ldif(self, object_name, class_name, class_ldap_display_name, attr_name, attr_value):
         # add object with correct syntax
         ldif = """
-dn: CN=%s,CN=Users,%s"""% (object_name, self.base_dn) + """
+dn: CN=%s,CN=Users,%s""" % (object_name, self.base_dn) + """
 objectClass: organizationalPerson
 objectClass: person
 objectClass: """ + class_ldap_display_name + """
 objectClass: top
 cn: """ + object_name + """
 instanceType: 4
-objectCategory: CN=%s,%s"""% (class_name, self.schema_dn) + """
-distinguishedName: CN=%s,CN=Users,%s"""% (object_name, self.base_dn) + """
+objectCategory: CN=%s,%s""" % (class_name, self.schema_dn) + """
+distinguishedName: CN=%s,CN=Users,%s""" % (object_name, self.base_dn) + """
 name: """ + object_name + """
 """ + attr_name + attr_value  + """
 """
diff --git a/source4/dsdb/tests/python/rodc_rwdc.py b/source4/dsdb/tests/python/rodc_rwdc.py
index 4b6c68486ad..5840dd6d6d9 100644
--- a/source4/dsdb/tests/python/rodc_rwdc.py
+++ b/source4/dsdb/tests/python/rodc_rwdc.py
@@ -350,7 +350,7 @@ class RodcRwdcCachedTests(password_lockout_base.BasePasswordTestCase):
         badPasswordTime = 0
         logonCount = 0
         lastLogon = 0
-        lastLogonTimestamp=0
+        lastLogonTimestamp = 0
         logoncount_relation = ''
         lastlogon_relation = ''
 
@@ -412,7 +412,7 @@ class RodcRwdcCachedTests(password_lockout_base.BasePasswordTestCase):
         badPasswordTime = 0
         logonCount = 0
         lastLogon = 0
-        lastLogonTimestamp=0
+        lastLogonTimestamp = 0
         logoncount_relation = ''
         lastlogon_relation = ''
 
diff --git a/source4/dsdb/tests/python/sec_descriptor.py b/source4/dsdb/tests/python/sec_descriptor.py
index 926c422a7e7..b35529bd9b5 100755
--- a/source4/dsdb/tests/python/sec_descriptor.py
+++ b/source4/dsdb/tests/python/sec_descriptor.py
@@ -1368,7 +1368,7 @@ class DaclDescriptorTests(DescriptorTests):
         desc_sddl = self.sd_utils.get_sd_as_sddl(group_dn)
         mod = mod.replace(";OI;", ";OIIOID;") # change it how it's gonna look like
         self.assertTrue(mod in desc_sddl)
-        self.sd_utils.modify_sd_on_dn(group_dn, "D:" +moded)
+        self.sd_utils.modify_sd_on_dn(group_dn, "D:" + moded)
         desc_sddl = self.sd_utils.get_sd_as_sddl(group_dn)
         self.assertTrue(moded in desc_sddl)
         self.assertTrue(mod in desc_sddl)
@@ -2076,7 +2076,7 @@ class SdAutoInheritTests(DescriptorTests):
             See that only the owner has been changed.
         """
         attrs = ["nTSecurityDescriptor", "replPropertyMetaData", "uSNChanged"]
-        controls=["sd_flags:1:%d" % (SECINFO_DACL)]
+        controls = ["sd_flags:1:%d" % (SECINFO_DACL)]
         ace = "(A;CI;CC;;;NU)"
         sub_ace = "(A;CIID;CC;;;NU)"
         sd_sddl = "O:BAG:BAD:P(A;CI;0x000f01ff;;;AU)"
diff --git a/source4/dsdb/tests/python/token_group.py b/source4/dsdb/tests/python/token_group.py
index f0ef51a5c0b..47ed46d7578 100755
--- a/source4/dsdb/tests/python/token_group.py
+++ b/source4/dsdb/tests/python/token_group.py
@@ -566,7 +566,7 @@ class DynamicTokenTest(samba.tests.TestCase):
         rids = samr_conn.GetGroupsForUser(user_handle)
         samr_dns = set()
         for rid in rids.rids:
-            self.assertEqual(rid.attributes, samr.SE_GROUP_MANDATORY | samr.SE_GROUP_ENABLED_BY_DEFAULT| samr.SE_GROUP_ENABLED)
+            self.assertEqual(rid.attributes, samr.SE_GROUP_MANDATORY | samr.SE_GROUP_ENABLED_BY_DEFAULT | samr.SE_GROUP_ENABLED)
             sid = "%s-%d" % (domain_sid, rid.rid)
             res = self.admin_ldb.search(base="<SID=%s>" % sid, scope=ldb.SCOPE_BASE,
                                         attrs=[])
diff --git a/source4/dsdb/tests/python/urgent_replication.py b/source4/dsdb/tests/python/urgent_replication.py
index 893c35eca22..5d41b1aa23c 100755
--- a/source4/dsdb/tests/python/urgent_replication.py
+++ b/source4/dsdb/tests/python/urgent_replication.py
@@ -117,7 +117,7 @@ systemFlags: 33554432""", ["relax:0"])
     def test_crossRef_object(self):
         """Test if the urgent replication is activated when handling a crossRef object."""
         self.ldb.add({
-            "dn": "CN=test crossRef,CN=Partitions,CN=Configuration,"+ self.base_dn,
+            "dn": "CN=test crossRef,CN=Partitions,CN=Configuration," + self.base_dn,
             "objectClass": "crossRef",
             "cn": "test crossRef",
             "dnsRoot": self.get_loadparm().get("realm").lower(),
diff --git a/source4/dsdb/tests/python/user_account_control.py b/source4/dsdb/tests/python/user_account_control.py
index 38353508e87..242462ad57f 100755
--- a/source4/dsdb/tests/python/user_account_control.py
+++ b/source4/dsdb/tests/python/user_account_control.py
@@ -196,7 +196,7 @@ class UserAccountControlTests(samba.tests.TestCase):
 
         self.sd_utils.dacl_add_ace("OU=test_computer_ou1," + self.base_dn, mod)
 
-        computername=self.computernames[0]
+        computername = self.computernames[0]
         sd = ldb.MessageElement((ndr_pack(self.sd_reference_modify)),
                                 ldb.FLAG_MOD_ADD,
                                 "nTSecurityDescriptor")
@@ -216,7 +216,7 @@ class UserAccountControlTests(samba.tests.TestCase):
 
         m = ldb.Message()
         m.dn = res[0].dn
-        m["description"]= ldb.MessageElement(
+        m["description"] = ldb.MessageElement(
             ("A description"), ldb.FLAG_MOD_REPLACE,
             "description")
         self.samdb.modify(m)
@@ -280,7 +280,7 @@ class UserAccountControlTests(samba.tests.TestCase):
 
         self.sd_utils.dacl_add_ace("OU=test_computer_ou1," + self.base_dn, mod)
 
-        computername=self.computernames[0]
+        computername = self.computernames[0]
         self.add_computer_ldap(computername)
 
         res = self.admin_samdb.search("%s" % self.base_dn,
@@ -290,7 +290,7 @@ class UserAccountControlTests(samba.tests.TestCase):
 
         m = ldb.Message()
         m.dn = res[0].dn
-        m["description"]= ldb.MessageElement(
+        m["description"] = ldb.MessageElement(
             ("A description"), ldb.FLAG_MOD_REPLACE,
             "description")
         self.samdb.modify(m)
@@ -336,7 +336,7 @@ class UserAccountControlTests(samba.tests.TestCase):
 
 
     def test_admin_mod_uac(self):
-        computername=self.computernames[0]
+        computername = self.computernames[0]
         self.add_computer_ldap(computername, samdb=self.admin_samdb)
 
         res = self.admin_samdb.search("%s" % self.base_dn,
@@ -380,7 +380,7 @@ class UserAccountControlTests(samba.tests.TestCase):
                                       scope=SCOPE_SUBTREE,
                                       attrs=["userAccountControl"])
 
-        self.assertEqual(int(res[0]["userAccountControl"][0]), UF_NORMAL_ACCOUNT| UF_ACCOUNTDISABLE)
+        self.assertEqual(int(res[0]["userAccountControl"][0]), UF_NORMAL_ACCOUNT | UF_ACCOUNTDISABLE)
 
 
     def test_uac_bits_set(self):
@@ -391,7 +391,7 @@ class UserAccountControlTests(samba.tests.TestCase):
 
         self.sd_utils.dacl_add_ace("OU=test_computer_ou1," + self.base_dn, mod)
 
-        computername=self.computernames[0]
+        computername = self.computernames[0]
         self.add_computer_ldap(computername)
 
         res = self.admin_samdb.search("%s" % self.base_dn,
@@ -401,7 +401,7 @@ class UserAccountControlTests(samba.tests.TestCase):
 
         m = ldb.Message()
         m.dn = res[0].dn
-        m["description"]= ldb.MessageElement(
+        m["description"] = ldb.MessageElement(
             ("A description"), ldb.FLAG_MOD_REPLACE,
             "description")
         self.samdb.modify(m)
@@ -446,7 +446,7 @@ class UserAccountControlTests(samba.tests.TestCase):
 
         self.sd_utils.dacl_add_ace("OU=test_computer_ou1," + self.base_dn, mod)
 
-        computername=self.computernames[0]
+        computername = self.computernames[0]
         self.add_computer_ldap(computername, others={"userAccountControl": [str(account_type)]})
 
         res = self.admin_samdb.search("%s" % self.base_dn,
@@ -457,7 +457,7 @@ class UserAccountControlTests(samba.tests.TestCase):
 
         m = ldb.Message()
         m.dn = res[0].dn
-        m["description"]= ldb.MessageElement(
+        m["description"] = ldb.MessageElement(
             ("A description"), ldb.FLAG_MOD_REPLACE,
             "description")
         self.samdb.modify(m)
@@ -606,7 +606,7 @@ class UserAccountControlTests(samba.tests.TestCase):
         self.uac_bits_unrelated_modify_helper(UF_WORKSTATION_TRUST_ACCOUNT)
 
     def test_uac_bits_add(self):
-        computername=self.computernames[0]
+        computername = self.computernames[0]
 
         user_sid = self.sd_utils.get_object_sid(self.unpriv_user_dn)
         mod = "(OA;;CC;bf967a86-0de6-11d0-a285-00aa003049e2;;%s)" % str(user_sid)
@@ -644,7 +644,7 @@ class UserAccountControlTests(samba.tests.TestCase):
                     self.fail("Unable to set userAccountControl bit 0x%08X on %s: %s" % (bit, computername, estr))
 
     def test_primarygroupID_cc_add(self):
-        computername=self.computernames[0]
+        computername = self.computernames[0]
 
         user_sid = self.sd_utils.get_object_sid(self.unpriv_user_dn)
         mod = "(OA;;CC;bf967a86-0de6-11d0-a285-00aa003049e2;;%s)" % str(user_sid)
@@ -662,7 +662,7 @@ class UserAccountControlTests(samba.tests.TestCase):
 
 
     def test_primarygroupID_priv_DC_modify(self):
-        computername=self.computernames[0]
+        computername = self.computernames[0]
 
         self.add_computer_ldap(computername,
                                others={"userAccountControl": [str(UF_SERVER_TRUST_ACCOUNT)]},
@@ -676,14 +676,14 @@ class UserAccountControlTests(samba.tests.TestCase):
         m = ldb.Message()
         m.dn = ldb.Dn(self.admin_samdb, "<SID=%s-%d>" % (str(self.domain_sid),
                                                          security.DOMAIN_RID_USERS))
-        m["member"]= ldb.MessageElement(
+        m["member"] = ldb.MessageElement(
             [str(res[0].dn)], ldb.FLAG_MOD_ADD,
             "member")
         self.admin_samdb.modify(m)
 
         m = ldb.Message()
         m.dn = res[0].dn
-        m["primaryGroupID"]= ldb.MessageElement(
+        m["primaryGroupID"] = ldb.MessageElement(
             [str(security.DOMAIN_RID_USERS)], ldb.FLAG_MOD_REPLACE,
             "primaryGroupID")
         try:
@@ -696,7 +696,7 @@ class UserAccountControlTests(samba.tests.TestCase):
             self.assertEqual(enum, ldb.ERR_UNWILLING_TO_PERFORM)
 
     def test_primarygroupID_priv_member_modify(self):
-        computername=self.computernames[0]
+        computername = self.computernames[0]
 
         self.add_computer_ldap(computername,
                                others={"userAccountControl": [str(UF_WORKSTATION_TRUST_ACCOUNT|UF_PARTIAL_SECRETS_ACCOUNT)]},
@@ -710,14 +710,14 @@ class UserAccountControlTests(samba.tests.TestCase):
         m = ldb.Message()
         m.dn = ldb.Dn(self.admin_samdb, "<SID=%s-%d>" % (str(self.domain_sid),
                                                          security.DOMAIN_RID_USERS))
-        m["member"]= ldb.MessageElement(
+        m["member"] = ldb.MessageElement(
             [str(res[0].dn)], ldb.FLAG_MOD_ADD,
             "member")
         self.admin_samdb.modify(m)
 
         m = ldb.Message()
         m.dn = res[0].dn
-        m["primaryGroupID"]= ldb.MessageElement(
+        m["primaryGroupID"] = ldb.MessageElement(
             [str(security.DOMAIN_RID_USERS)], ldb.FLAG_MOD_REPLACE,
             "primaryGroupID")
         try:
@@ -731,7 +731,7 @@ class UserAccountControlTests(samba.tests.TestCase):
 
 
     def test_primarygroupID_priv_user_modify(self):
-        computername=self.computernames[0]
+        computername = self.computernames[0]
 
         self.add_computer_ldap(computername,
                                others={"userAccountControl": [str(UF_WORKSTATION_TRUST_ACCOUNT)]},
@@ -745,14 +745,14 @@ class UserAccountControlTests(samba.tests.TestCase):
         m = ldb.Message()
         m.dn = ldb.Dn(self.admin_samdb, "<SID=%s-%d>" % (str(self.domain_sid),
                                                          security.DOMAIN_RID_ADMINS))
-        m["member"]= ldb.MessageElement(
+        m["member"] = ldb.MessageElement(
             [str(res[0].dn)], ldb.FLAG_MOD_ADD,
             "member")
         self.admin_samdb.modify(m)
 
         m = ldb.Message()
         m.dn = res[0].dn
-        m["primaryGroupID"]= ldb.MessageElement(
+        m["primaryGroupID"] = ldb.MessageElement(
             [str(security.DOMAIN_RID_ADMINS)], ldb.FLAG_MOD_REPLACE,
             "primaryGroupID")
         self.admin_samdb.modify(m)
diff --git a/source4/scripting/devel/demodirsync.py b/source4/scripting/devel/demodirsync.py
index 01c31729068..83263ea9f03 100755
--- a/source4/scripting/devel/demodirsync.py
+++ b/source4/scripting/devel/demodirsync.py
@@ -37,11 +37,11 @@ def printdirsync(ctl):
             print("highest usn %s" % cookie.blob.highwatermark.highest_usn)
             print("tmp higest usn %s" % cookie.blob.highwatermark.tmp_highest_usn)
             print("reserved usn %s" % cookie.blob.highwatermark.reserved_usn)
-            if cookie.blob.extra_length >0:
+            if cookie.blob.extra_length > 0:
                 print("highest usn in extra %s" % cookie.blob.extra.ctr.cursors[0].highest_usn)
         return cookie
 
-remote_ldb= Ldb("ldap://" + opts.host + ":389", credentials=creds, lp=lp)
+remote_ldb = Ldb("ldap://" + opts.host + ":389", credentials=creds, lp=lp)
 tab = []
 if opts.b:
     base = opts.b
@@ -74,7 +74,7 @@ savedcookie = cookie
 
 print("")
 print("Getting allusers with cookie")
-controls=["dirsync:1:1:50:%s" % base64.b64encode(ndr_pack(cookie)).decode('utf8')]
+controls = ["dirsync:1:1:50:%s" % base64.b64encode(ndr_pack(cookie)).decode('utf8')]
 (msgs, ctrls) = remote_ldb.searchex(expression="(samaccountname=*)", base=base, attrs=["objectClass"], controls=controls)
 if (len(ctrls)):
     for ctl in ctrls:
@@ -88,7 +88,7 @@ if cookie.blob.extra_length > 0:
 
 print("")
 print("Getting all the entries")
-controls=["dirsync:1:1:50:%s" % base64.b64encode(ndr_pack(cookie)).decode('utf8')]
+controls = ["dirsync:1:1:50:%s" % base64.b64encode(ndr_pack(cookie)).decode('utf8')]
 (msgs, ctrls) = remote_ldb.searchex(expression="(objectclass=*)", base=base, controls=controls)
 cont = 0
 if (len(ctrls)):
@@ -105,7 +105,7 @@ else:
     bigusn  = usn + 1000
 while (cont == "1"):
     print("")
-    controls=["dirsync:1:1:50:%s" % base64.b64encode(ndr_pack(cookie)).decode('utf8')]
+    controls = ["dirsync:1:1:50:%s" % base64.b64encode(ndr_pack(cookie)).decode('utf8')]
     (msgs, ctrls) = remote_ldb.searchex(expression="(objectclass=*)", base=base, controls=controls)
     if (len(ctrls)):
         for ctl in ctrls:
@@ -121,7 +121,7 @@ cookie.blob.highwatermark.tmp_highest_usn = usn - 2
 if cookie.blob.extra_length > 0:
     print("here")
     cookie.blob.extra.ctr.cursors[0].highest_usn = bigusn - 1
-controls=["dirsync:1:1:50:%s" % base64.b64encode(ndr_pack(cookie)).decode('utf8')]
+controls = ["dirsync:1:1:50:%s" % base64.b64encode(ndr_pack(cookie)).decode('utf8')]
 (msgs, ctrls) = remote_ldb.searchex(expression="(objectclass=*)", base=base, controls=controls)
 if (len(ctrls)):
     for ctl in ctrls:
@@ -136,7 +136,7 @@ cookie.blob.highwatermark.tmp_highest_usn = usn - 2
 if cookie.blob.extra_length > 0:
     cookie.blob.extra.ctr.cursors[0].source_dsa_invocation_id = misc.GUID("128a99bf-e2df-4832-ac0a-1fb625e530db")
     cookie.blob.extra.ctr.cursors[0].highest_usn = bigusn - 1
-controls=["dirsync:1:1:50:%s" % base64.b64encode(ndr_pack(cookie)).decode('utf8'))
+controls = ["dirsync:1:1:50:%s" % base64.b64encode(ndr_pack(cookie)).decode('utf8'))
 (msgs, ctrls) = remote_ldb.searchex(expression="(objectclass=*)", base=base, controls=controls)
 if (len(ctrls)):
     for ctl in ctrls:
@@ -149,7 +149,7 @@ cookie.blob.highwatermark.highest_usn = 0
 cookie.blob.highwatermark.tmp_highest_usn = (usn - 2)
 if cookie.blob.extra_length > 0:
     cookie.blob.extra.ctr.cursors[0].highest_usn = (usn - 2)
-controls=["dirsync:1:1:50:%s" % base64.b64encode(ndr_pack(cookie)).decode('utf8')]
+controls = ["dirsync:1:1:50:%s" % base64.b64encode(ndr_pack(cookie)).decode('utf8')]
 (msgs, ctrls) = remote_ldb.searchex(expression="(objectclass=*)", base=base, controls=controls)
 if (len(ctrls)):
     for ctl in ctrls:
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 4efcf77e590..89acae305e0 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -172,7 +172,7 @@ for bindoptions in ["seal,padcheck"] + validate_list + ["bigendian"]:
         elif transport == "ncacn_ip_tcp":
             tests = ncacn_ip_tcp_tests
         else:
-            raise AssertionError("invalid transport %r"% transport)
+            raise AssertionError("invalid transport %r" % transport)
         for t in tests:
             plansmbtorture4testsuite(t, env, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN'], "samba4.%s on %s with %s" % (t, transport, bindoptions))
         plansmbtorture4testsuite('rpc.samba3-sharesec', env, ["%s:$SERVER[%s]" % (transport, bindoptions), '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '--option=torture:share=tmp'], "samba4.rpc.samba3.sharesec on %s with %s" % (transport, bindoptions))
@@ -1058,7 +1058,7 @@ plansmbtorture4testsuite('krb5.kdc', "rodc", ['ncacn_np:$SERVER_IP', "-k", "yes"
                          "samba4.krb5.kdc with account ALLOWED permission to replicate to an RODC")
 
 # This ensures we have correct behaviour on a server that is not not the PDC emulator
-env="promoted_dc"
+env = "promoted_dc"
 plansmbtorture4testsuite('krb5.kdc', env, ['ncacn_np:$SERVER_IP', "-k", "yes", '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '--realm=$REALM'],
                          "samba4.krb5.kdc with specified account")
 
diff --git a/source4/torture/drs/python/drs_base.py b/source4/torture/drs/python/drs_base.py
index 85bb1f75f75..c84e819fc21 100644
--- a/source4/torture/drs/python/drs_base.py
+++ b/source4/torture/drs/python/drs_base.py
@@ -252,7 +252,7 @@ class DrsBaseTestCase(SambaToolCmdTest):
 
             next_object = ctr6.first_object
             for i in range(0, ctr6.object_count):
-                print("Obj %d: %s %s" %(i, next_object.object.identifier.dn[:25],
+                print("Obj %d: %s %s" % (i, next_object.object.identifier.dn[:25],
                                         next_object.object.identifier.guid))
                 next_object = next_object.next_object
 
@@ -267,16 +267,16 @@ class DrsBaseTestCase(SambaToolCmdTest):
                                         l.value.blob)
 
                 print("Link Tgt %s... <-- Src %s"
-                      %(target.dn[:25], l.identifier.guid))
+                      % (target.dn[:25], l.identifier.guid))
                 state = "Del"
                 if l.flags & drsuapi.DRSUAPI_DS_LINKED_ATTRIBUTE_FLAG_ACTIVE:
                     state = "Act"
-                print("  v%u %s changed %u" %(l.meta_data.version, state,
+                print("  v%u %s changed %u" % (l.meta_data.version, state,
                                               l.meta_data.originating_change_time))
 
-            print("HWM:     %d" %(ctr6.new_highwatermark.highest_usn))
-            print("Tmp HWM: %d" %(ctr6.new_highwatermark.tmp_highest_usn))
-            print("More data: %d" %(ctr6.more_data))
+            print("HWM:     %d" % (ctr6.new_highwatermark.highest_usn))
+            print("Tmp HWM: %d" % (ctr6.new_highwatermark.tmp_highest_usn))
+            print("More data: %d" % (ctr6.more_data))
 
     def _get_replication(self, replica_flags,
                          drs_error=drsuapi.DRSUAPI_EXOP_ERR_NONE, drs=None, drs_handle=None,
diff --git a/source4/torture/drs/python/getnc_exop.py b/source4/torture/drs/python/getnc_exop.py
index d88a87e81ed..a7492aa33d2 100644
--- a/source4/torture/drs/python/getnc_exop.py
+++ b/source4/torture/drs/python/getnc_exop.py
@@ -267,14 +267,14 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
                                                 drsuapi.DRSUAPI_DRS_WRIT_REP)
 
         self._check_replication([ou1,ou2,dc3],
-                                drsuapi.DRSUAPI_DRS_WRIT_REP|
+                                drsuapi.DRSUAPI_DRS_WRIT_REP |
                                 drsuapi.DRSUAPI_DRS_GET_ANC)
 
         self._check_replication([dc3],
                                 drsuapi.DRSUAPI_DRS_CRITICAL_ONLY)
 
         self._check_replication([ou1,ou2,dc3],
-                                drsuapi.DRSUAPI_DRS_CRITICAL_ONLY|
+                                drsuapi.DRSUAPI_DRS_CRITICAL_ONLY |
                                 drsuapi.DRSUAPI_DRS_GET_ANC)
 
         m = ldb.Message()
@@ -286,14 +286,14 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
                                                 drsuapi.DRSUAPI_DRS_WRIT_REP)
 
         self._check_replication([ou1,ou2,dc3],
-                                drsuapi.DRSUAPI_DRS_WRIT_REP|
+                                drsuapi.DRSUAPI_DRS_WRIT_REP |
                                 drsuapi.DRSUAPI_DRS_GET_ANC)
 
         self._check_replication([dc3],
                                 drsuapi.DRSUAPI_DRS_CRITICAL_ONLY)
 
         self._check_replication([ou1,ou2,dc3],
-                                drsuapi.DRSUAPI_DRS_CRITICAL_ONLY|
+                                drsuapi.DRSUAPI_DRS_CRITICAL_ONLY |
                                 drsuapi.DRSUAPI_DRS_GET_ANC)
 
         self._check_replication([ou1],
@@ -301,12 +301,12 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
                                 highwatermark=hwm1)
 
         self._check_replication([ou1],
-                                drsuapi.DRSUAPI_DRS_WRIT_REP|
+                                drsuapi.DRSUAPI_DRS_WRIT_REP |
                                 drsuapi.DRSUAPI_DRS_GET_ANC,
                                 highwatermark=hwm1)
 
         self._check_replication([ou1],
-                                drsuapi.DRSUAPI_DRS_WRIT_REP|
+                                drsuapi.DRSUAPI_DRS_WRIT_REP |
                                 drsuapi.DRSUAPI_DRS_GET_ANC,
                                 uptodateness_vector=utdv1)
 
@@ -319,14 +319,14 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
                                                 drsuapi.DRSUAPI_DRS_WRIT_REP)
 
         self._check_replication([ou1,ou2,dc3],
-                                drsuapi.DRSUAPI_DRS_WRIT_REP|
+                                drsuapi.DRSUAPI_DRS_WRIT_REP |
                                 drsuapi.DRSUAPI_DRS_GET_ANC)
 
         self._check_replication([dc3],
                                 drsuapi.DRSUAPI_DRS_CRITICAL_ONLY)
 
         self._check_replication([ou1,ou2,dc3],
-                                drsuapi.DRSUAPI_DRS_CRITICAL_ONLY|
+                                drsuapi.DRSUAPI_DRS_CRITICAL_ONLY |
                                 drsuapi.DRSUAPI_DRS_GET_ANC)
 
         self._check_replication([ou1,ou2],
@@ -334,12 +334,12 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
                                 highwatermark=hwm1)
 
         self._check_replication([ou1,ou2],
-                                drsuapi.DRSUAPI_DRS_WRIT_REP|
+                                drsuapi.DRSUAPI_DRS_WRIT_REP |
                                 drsuapi.DRSUAPI_DRS_GET_ANC,
                                 highwatermark=hwm1)
 
         self._check_replication([ou1,ou2],
-                                drsuapi.DRSUAPI_DRS_WRIT_REP|
+                                drsuapi.DRSUAPI_DRS_WRIT_REP |
                                 drsuapi.DRSUAPI_DRS_GET_ANC,
                                 uptodateness_vector=utdv1)
 
@@ -352,18 +352,18 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
                                                 drsuapi.DRSUAPI_DRS_WRIT_REP)
 
         self._check_replication([self.ou,ou1,ou2,dc3],
-                                drsuapi.DRSUAPI_DRS_WRIT_REP|
+                                drsuapi.DRSUAPI_DRS_WRIT_REP |
                                 drsuapi.DRSUAPI_DRS_GET_ANC)
 
         self._check_replication([dc3],
                                 drsuapi.DRSUAPI_DRS_CRITICAL_ONLY)
 
         self._check_replication([self.ou,ou1,ou2,dc3],
-                                drsuapi.DRSUAPI_DRS_CRITICAL_ONLY|
+                                drsuapi.DRSUAPI_DRS_CRITICAL_ONLY |
                                 drsuapi.DRSUAPI_DRS_GET_ANC)
 
         self._check_replication([self.ou,ou2],
-                                drsuapi.DRSUAPI_DRS_WRIT_REP|
+                                drsuapi.DRSUAPI_DRS_WRIT_REP |
                                 drsuapi.DRSUAPI_DRS_GET_ANC,
                                 uptodateness_vector=utdv2)
 
@@ -378,14 +378,14 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
                                                 drsuapi.DRSUAPI_DRS_WRIT_REP)
 
         self._check_replication([self.ou,ou1,ou2,dc3,cn3],
-                                drsuapi.DRSUAPI_DRS_WRIT_REP|
+                                drsuapi.DRSUAPI_DRS_WRIT_REP |
                                 drsuapi.DRSUAPI_DRS_GET_ANC)
 
         self._check_replication([dc3],
                                 drsuapi.DRSUAPI_DRS_CRITICAL_ONLY)
 
         self._check_replication([self.ou,ou1,ou2,dc3],
-                                drsuapi.DRSUAPI_DRS_CRITICAL_ONLY|
+                                drsuapi.DRSUAPI_DRS_CRITICAL_ONLY |
                                 drsuapi.DRSUAPI_DRS_GET_ANC)
 
         m = ldb.Message()
@@ -402,7 +402,7 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
 
         # Can fail against Windows due to equal precedence of dc3, cn3
         self._check_replication([self.ou,ou1,ou2,dc3,cn3],
-                                drsuapi.DRSUAPI_DRS_WRIT_REP|
+                                drsuapi.DRSUAPI_DRS_WRIT_REP |
                                 drsuapi.DRSUAPI_DRS_GET_ANC,
                                 expected_links=[ou2_managedBy_dc3])
 
@@ -410,7 +410,7 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
                                 drsuapi.DRSUAPI_DRS_CRITICAL_ONLY)
 
         self._check_replication([self.ou,ou1,ou2,dc3],
-                                drsuapi.DRSUAPI_DRS_CRITICAL_ONLY|
+                                drsuapi.DRSUAPI_DRS_CRITICAL_ONLY |
                                 drsuapi.DRSUAPI_DRS_GET_ANC)
 
         self._check_replication([],
@@ -453,7 +453,7 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
                                 expected_links=[dc3_managedBy_ou1])
 
         self._check_replication([self.ou,ou1,ou2,dc3],
-                                drsuapi.DRSUAPI_DRS_CRITICAL_ONLY|
+                                drsuapi.DRSUAPI_DRS_CRITICAL_ONLY |
                                 drsuapi.DRSUAPI_DRS_GET_ANC,
                                 expected_links=[dc3_managedBy_ou1])
 
@@ -491,7 +491,7 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
                                 expected_links=[dc3_managedBy_ou1,dc3_managedBy_ou2])
 
         self._check_replication([self.ou,ou1,ou2,dc3],
-                                drsuapi.DRSUAPI_DRS_CRITICAL_ONLY|
+                                drsuapi.DRSUAPI_DRS_CRITICAL_ONLY |
                                 drsuapi.DRSUAPI_DRS_GET_ANC,
                                 expected_links=[dc3_managedBy_ou1,dc3_managedBy_ou2])
 
@@ -511,7 +511,7 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
                                 highwatermark=hwm7)
 
         self._check_replication([],
-                                drsuapi.DRSUAPI_DRS_WRIT_REP|
+                                drsuapi.DRSUAPI_DRS_WRIT_REP |
                                 drsuapi.DRSUAPI_DRS_GET_ANC,
                                 expected_links=[dc3_managedBy_ou1,dc3_managedBy_ou2],
                                 highwatermark=hwm7)
@@ -522,7 +522,7 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
                                 highwatermark=hwm7)
 
         self._check_replication([],
-                                drsuapi.DRSUAPI_DRS_CRITICAL_ONLY|
+                                drsuapi.DRSUAPI_DRS_CRITICAL_ONLY |
                                 drsuapi.DRSUAPI_DRS_GET_ANC,
                                 expected_links=[dc3_managedBy_ou1,dc3_managedBy_ou2],
                                 highwatermark=hwm7)
@@ -541,7 +541,7 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
                                 uptodateness_vector=utdv7)
 
         self._check_replication([],
-                                drsuapi.DRSUAPI_DRS_WRIT_REP|
+                                drsuapi.DRSUAPI_DRS_WRIT_REP |
                                 drsuapi.DRSUAPI_DRS_GET_ANC,
                                 expected_links=[dc3_managedBy_ou1,dc3_managedBy_ou2],
                                 uptodateness_vector=utdv7)
@@ -552,7 +552,7 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase):
                                 uptodateness_vector=utdv7)
 
         self._check_replication([],
-                                drsuapi.DRSUAPI_DRS_CRITICAL_ONLY|
+                                drsuapi.DRSUAPI_DRS_CRITICAL_ONLY |
                                 drsuapi.DRSUAPI_DRS_GET_ANC,
                                 expected_links=[dc3_managedBy_ou1,dc3_managedBy_ou2],
                                 uptodateness_vector=utdv7)
diff --git a/source4/torture/drs/python/getnc_unpriv.py b/source4/torture/drs/python/getnc_unpriv.py
index dcdde0c3311..17ad175b1f3 100644
--- a/source4/torture/drs/python/getnc_unpriv.py
+++ b/source4/torture/drs/python/getnc_unpriv.py
@@ -58,8 +58,8 @@ class DrsReplicaSyncUnprivTestCase(drs_base.DrsBaseTestCase):
         # objects can be slow to replicate out. So the OU created by a previous
         # testenv may still exist at this point).
         rand = random.randint(1, 10000000)
-        test_ou = "OU=test_getnc_unpriv%d" %rand
-        self.ou = "%s,%s" %(test_ou, self.base_dn)
+        test_ou = "OU=test_getnc_unpriv%d" % rand
+        self.ou = "%s,%s" % (test_ou, self.base_dn)
         self.ldb_dc1.add({
             "dn": self.ou,
             "objectclass": "organizationalUnit"})