diff options
author | Joe Guo <joeg@catalyst.net.nz> | 2018-07-30 18:18:34 +1200 |
---|---|---|
committer | Douglas Bagnall <dbagnall@samba.org> | 2018-08-24 07:49:28 +0200 |
commit | 35de42275bc8475466ef29d1e2c2c7391c9f769b (patch) | |
tree | 8ea0dcdb02e80da1416cc2418cfc7fc405ea93cf | |
parent | e1edeae83c0519c5865247500b8432ff2ab47dab (diff) | |
download | samba-35de42275bc8475466ef29d1e2c2c7391c9f769b.tar.gz |
PEP8: fix E228: missing whitespace around modulo 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>
-rw-r--r-- | python/samba/ntacls.py | 2 | ||||
-rw-r--r-- | python/samba/provision/__init__.py | 6 | ||||
-rw-r--r-- | python/samba/upgradehelpers.py | 6 | ||||
-rw-r--r-- | source4/torture/drs/python/fsmo.py | 6 | ||||
-rw-r--r-- | source4/torture/drs/python/getnc_exop.py | 2 | ||||
-rw-r--r-- | source4/torture/drs/python/ridalloc_exop.py | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/python/samba/ntacls.py b/python/samba/ntacls.py index e64892d45ca..1fddeddc859 100644 --- a/python/samba/ntacls.py +++ b/python/samba/ntacls.py @@ -78,7 +78,7 @@ def checkset_backend(lp, backend, eadbfile): else: return (samba.xattr_tdb, os.path.abspath(os.path.join(lp.get("state dir"), "xattr.tdb"))) else: - raise XattrBackendError("Invalid xattr backend choice %s"%backend) + raise XattrBackendError("Invalid xattr backend choice %s" %backend) def getdosinfo(lp, file): try: diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index 4dc6a5a75d9..a4f808ccd4a 100644 --- a/python/samba/provision/__init__.py +++ b/python/samba/provision/__init__.py @@ -1140,7 +1140,7 @@ def setup_self_join(samdb, admin_session_info, names, fill, machinepass, """Join a host to its own domain.""" assert isinstance(invocationid, str) if ntdsguid is not None: - ntdsguid_line = "objectGUID: %s\n"%ntdsguid + ntdsguid_line = "objectGUID: %s\n" %ntdsguid else: ntdsguid_line = "" @@ -1610,7 +1610,7 @@ def set_gpos_acl(sysvol, dnsdomain, domainsid, domaindn, samdb, lp, use_ntvfs, p setntacl(lp, root_policy_path, POLICIES_ACL, str(domainsid), use_ntvfs=use_ntvfs, skip_invalid_chown=True, passdb=passdb, service=SYSVOL_SERVICE) - res = samdb.search(base="CN=Policies,CN=System,%s"%(domaindn), + res = samdb.search(base="CN=Policies,CN=System,%s" %(domaindn), attrs=["cn", "nTSecurityDescriptor"], expression="", scope=ldb.SCOPE_ONELEVEL) @@ -1783,7 +1783,7 @@ def check_gpos_acl(sysvol, dnsdomain, domainsid, domaindn, samdb, lp, fsacl_sddl = fsacl.as_sddl(domainsid) if fsacl_sddl != POLICIES_ACL: raise ProvisioningError('%s ACL on policy root %s %s does not match expected value %s from provision' % (acl_type(direct_db_access), root_policy_path, fsacl_sddl, fsacl)) - res = samdb.search(base="CN=Policies,CN=System,%s"%(domaindn), + res = samdb.search(base="CN=Policies,CN=System,%s" %(domaindn), attrs=["cn", "nTSecurityDescriptor"], expression="", scope=ldb.SCOPE_ONELEVEL) diff --git a/python/samba/upgradehelpers.py b/python/samba/upgradehelpers.py index 300e59a84e3..2e6ed1cfdbc 100644 --- a/python/samba/upgradehelpers.py +++ b/python/samba/upgradehelpers.py @@ -560,8 +560,8 @@ def construct_existor_expr(attrs): if len(attrs) > 0: expr = "(|" for att in attrs: - expr = "%s(%s=*)"%(expr,att) - expr = "%s)"%expr + expr = "%s(%s=*)" %(expr,att) + expr = "%s)" %expr return expr def update_machine_account_password(samdb, secrets_ldb, names): @@ -809,7 +809,7 @@ def print_provision_ranges(dic, limit_print, dest, samdb_path, invocationid): print("To track the USNs modified/created by provision and upgrade proivsion,") print(" the following ranges are proposed to be added to your provision sam.ldb: \n%s" % ldif) print("We recommend to review them, and if it's correct to integrate the following ldif: %s in your sam.ldb" % file) - print("You can load this file like this: ldbadd -H %s %s\n"%(str(samdb_path),file)) + print("You can load this file like this: ldbadd -H %s %s\n" %(str(samdb_path),file)) ldif = "dn: @PROVISION\nprovisionnerID: %s\n%s" % (invocationid, ldif) open(file,'w').write(ldif) diff --git a/source4/torture/drs/python/fsmo.py b/source4/torture/drs/python/fsmo.py index 6be55f8b70c..67b8331614d 100644 --- a/source4/torture/drs/python/fsmo.py +++ b/source4/torture/drs/python/fsmo.py @@ -107,7 +107,7 @@ class DrsFsmoTestCase(drs_base.DrsBaseTestCase): role_dn=role_dn, master=self.dsServiceName_dc2) self.assertTrue(res, - "Transferring %s role to %s has failed, master is: %s!"%(role, self.dsServiceName_dc2, master)) + "Transferring %s role to %s has failed, master is: %s!" %(role, self.dsServiceName_dc2, master)) # dc1 gets back the role from dc2 print("Testing for %s role transfer from %s to %s" % (role, self.dnsname_dc2, self.dnsname_dc1)) @@ -117,7 +117,7 @@ class DrsFsmoTestCase(drs_base.DrsBaseTestCase): role_dn=role_dn, master=self.dsServiceName_dc1) self.assertTrue(res, - "Transferring %s role to %s has failed, master is: %s!"%(role, self.dsServiceName_dc1, master)) + "Transferring %s role to %s has failed, master is: %s!" %(role, self.dsServiceName_dc1, master)) # dc1 keeps the role print("Testing for no-op %s role transfer from %s to %s" % (role, self.dnsname_dc2, self.dnsname_dc1)) @@ -127,7 +127,7 @@ class DrsFsmoTestCase(drs_base.DrsBaseTestCase): role_dn=role_dn, master=self.dsServiceName_dc1) self.assertTrue(res, - "Transferring %s role to %s has failed, master is: %s!"%(role, self.dsServiceName_dc1, master)) + "Transferring %s role to %s has failed, master is: %s!" %(role, self.dsServiceName_dc1, master)) def test_SchemaMasterTransfer(self): self._role_transfer(role="schema", role_dn=self.schema_dn) diff --git a/source4/torture/drs/python/getnc_exop.py b/source4/torture/drs/python/getnc_exop.py index a7492aa33d2..21c7a1853dc 100644 --- a/source4/torture/drs/python/getnc_exop.py +++ b/source4/torture/drs/python/getnc_exop.py @@ -122,7 +122,7 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase): # determine the owner dc res = self.ldb_dc1.search(fsmo_obj_dn, scope=SCOPE_BASE, attrs=["fSMORoleOwner"]) - assert len(res) == 1, "Only one fSMORoleOwner value expected for %s!"%fsmo_obj_dn + assert len(res) == 1, "Only one fSMORoleOwner value expected for %s!" %fsmo_obj_dn fsmo_owner = res[0]["fSMORoleOwner"][0] if fsmo_owner == self.info_dc1["dsServiceName"][0]: return (fsmo_info_1, fsmo_info_2) diff --git a/source4/torture/drs/python/ridalloc_exop.py b/source4/torture/drs/python/ridalloc_exop.py index 0aa004459ac..68713b49e39 100644 --- a/source4/torture/drs/python/ridalloc_exop.py +++ b/source4/torture/drs/python/ridalloc_exop.py @@ -83,7 +83,7 @@ class DrsReplicaSyncTestCase(drs_base.DrsBaseTestCase): # determine the owner dc res = self.ldb_dc1.search(fsmo_obj_dn, scope=SCOPE_BASE, attrs=["fSMORoleOwner"]) - assert len(res) == 1, "Only one fSMORoleOwner value expected for %s!"%fsmo_obj_dn + assert len(res) == 1, "Only one fSMORoleOwner value expected for %s!" %fsmo_obj_dn fsmo_owner = res[0]["fSMORoleOwner"][0] if fsmo_owner == self.info_dc1["dsServiceName"][0]: return (fsmo_info_1, fsmo_info_2) |