summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorJoe Guo <joeg@catalyst.net.nz>2018-07-30 18:14:45 +1200
committerDouglas Bagnall <dbagnall@samba.org>2018-08-24 07:49:26 +0200
commitaa163f1a9c858203d900bbeda0e76ca247d0eace (patch)
treef493218217189f6aca23fa1ab977a3022cdb1ed0 /python
parentdba0c7ebe5e91a6124e48a62a28f460c2fc9bf79 (diff)
downloadsamba-aa163f1a9c858203d900bbeda0e76ca247d0eace.tar.gz
PEP8: fix E125: continuation line with same indent as next logical line
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/netcmd/ou.py2
-rw-r--r--python/samba/provision/__init__.py4
-rw-r--r--python/samba/provision/sambadns.py2
-rw-r--r--python/samba/upgradehelpers.py4
4 files changed, 6 insertions, 6 deletions
diff --git a/python/samba/netcmd/ou.py b/python/samba/netcmd/ou.py
index ce9a1656506..c5fe6ce75d8 100644
--- a/python/samba/netcmd/ou.py
+++ b/python/samba/netcmd/ou.py
@@ -304,7 +304,7 @@ class cmd_list(Command):
}
def run(self, sambaopts=None, credopts=None, versionopts=None, H=None,
- full_dn=False):
+ full_dn=False):
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp, fallback_machine=True)
samdb = SamDB(url=H, session_info=system_session(),
diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index 56e2c5f6c28..7eaffc91cf8 100644
--- a/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
@@ -280,7 +280,7 @@ def find_provision_key_parameters(samdb, secretsdb, idmapdb, paths, smbconf,
names.domainsid = ndr_unpack( security.dom_sid, res6[0]["objectSid"][0])
names.forestsid = ndr_unpack( security.dom_sid, res6[0]["objectSid"][0])
if res6[0].get("msDS-Behavior-Version") is None or \
- int(res6[0]["msDS-Behavior-Version"][0]) < DS_DOMAIN_FUNCTION_2000:
+ int(res6[0]["msDS-Behavior-Version"][0]) < DS_DOMAIN_FUNCTION_2000:
names.domainlevel = DS_DOMAIN_FUNCTION_2000
else:
names.domainlevel = int(res6[0]["msDS-Behavior-Version"][0])
@@ -1792,7 +1792,7 @@ def check_gpos_acl(sysvol, dnsdomain, domainsid, domaindn, samdb, lp,
def checksysvolacl(samdb, netlogon, sysvol, domainsid, dnsdomain, domaindn,
- lp):
+ lp):
"""Set the ACL for the sysvol share and the subfolders
:param samdb: An LDB object on the SAM db
diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py
index 99dff9c9ba1..b7a47ed849d 100644
--- a/python/samba/provision/sambadns.py
+++ b/python/samba/provision/sambadns.py
@@ -980,7 +980,7 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend, logger):
def create_named_txt(path, realm, dnsdomain, dnsname, binddns_dir,
- keytab_name):
+ keytab_name):
"""Write out a file containing zone statements suitable for inclusion in a
named.conf file (including GSS-TSIG configuration).
diff --git a/python/samba/upgradehelpers.py b/python/samba/upgradehelpers.py
index 7c0dbac2d56..fd57ae3ec3c 100644
--- a/python/samba/upgradehelpers.py
+++ b/python/samba/upgradehelpers.py
@@ -530,7 +530,7 @@ def delta_update_basesamdb(refsampath, sampath, creds, session, lp, message):
delta = sam.msg_diff(empty, refentry)
message(CHANGE, "Adding %s to sam db" % str(refentry.dn))
if str(refentry.dn) == "@PROVISION" and\
- delta.get(samba.provision.LAST_PROVISION_USN_ATTRIBUTE):
+ delta.get(samba.provision.LAST_PROVISION_USN_ATTRIBUTE):
delta.remove(samba.provision.LAST_PROVISION_USN_ATTRIBUTE)
delta.dn = refentry.dn
sam.add(delta)
@@ -539,7 +539,7 @@ def delta_update_basesamdb(refsampath, sampath, creds, session, lp, message):
if str(refentry.dn) == "@ATTRIBUTES":
deltaattr = sam.msg_diff(refentry, entry[0])
if str(refentry.dn) == "@PROVISION" and\
- delta.get(samba.provision.LAST_PROVISION_USN_ATTRIBUTE):
+ delta.get(samba.provision.LAST_PROVISION_USN_ATTRIBUTE):
delta.remove(samba.provision.LAST_PROVISION_USN_ATTRIBUTE)
if len(delta.items()) > 1:
delta.dn = refentry.dn