summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorJoe Guo <joeg@catalyst.net.nz>2018-07-30 18:18:34 +1200
committerDouglas Bagnall <dbagnall@samba.org>2018-08-24 07:49:28 +0200
commit35de42275bc8475466ef29d1e2c2c7391c9f769b (patch)
tree8ea0dcdb02e80da1416cc2418cfc7fc405ea93cf /python
parente1edeae83c0519c5865247500b8432ff2ab47dab (diff)
downloadsamba-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>
Diffstat (limited to 'python')
-rw-r--r--python/samba/ntacls.py2
-rw-r--r--python/samba/provision/__init__.py6
-rw-r--r--python/samba/upgradehelpers.py6
3 files changed, 7 insertions, 7 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)