diff options
author | Joe Guo <joeg@catalyst.net.nz> | 2018-07-30 18:14:13 +1200 |
---|---|---|
committer | Douglas Bagnall <dbagnall@samba.org> | 2018-08-24 07:49:26 +0200 |
commit | b43408b383d06d7c0c87b8f6e9549544fc057bc2 (patch) | |
tree | a4c7f0a0eab976cc70266a8eb36195a45e59f95b /python | |
parent | 5037731e0dad92c9d538eb3cd437b8b672df865b (diff) | |
download | samba-b43408b383d06d7c0c87b8f6e9549544fc057bc2.tar.gz |
PEP8: fix E121: continuation line under-indented for hanging indent
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/domain.py | 20 | ||||
-rw-r--r-- | python/samba/netcmd/domain_backup.py | 4 | ||||
-rw-r--r-- | python/samba/netcmd/drs.py | 2 | ||||
-rw-r--r-- | python/samba/netcmd/user.py | 2 | ||||
-rw-r--r-- | python/samba/provision/__init__.py | 4 | ||||
-rw-r--r-- | python/samba/samdb.py | 2 | ||||
-rw-r--r-- | python/samba/schema.py | 2 |
7 files changed, 18 insertions, 18 deletions
diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index 6f2e04b8ad7..25d1d4a67b0 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -659,7 +659,7 @@ class cmd_domain_join(Command): Option("--parent-domain", help="parent domain to create subdomain under", type=str), Option("--adminpass", type="string", metavar="PASSWORD", help="choose adminstrator password when joining as a subdomain (otherwise random)"), - ] + ] ntvfs_options = [ Option("--use-ntvfs", help="Use NTVFS for the fileserver (default = no)", @@ -1227,7 +1227,7 @@ class cmd_domain_level(Command): m = ldb.Message() m.dn = ldb.Dn(samdb, domain_dn) m["msDS-Behavior-Version"]= ldb.MessageElement( - str(new_level_domain), ldb.FLAG_MOD_REPLACE, + str(new_level_domain), ldb.FLAG_MOD_REPLACE, "msDS-Behavior-Version") samdb.modify(m) # Under partitions @@ -1235,7 +1235,7 @@ class cmd_domain_level(Command): m.dn = ldb.Dn(samdb, "CN=" + lp.get("workgroup") + ",CN=Partitions,%s" % samdb.get_config_basedn()) m["msDS-Behavior-Version"]= ldb.MessageElement( - str(new_level_domain), ldb.FLAG_MOD_REPLACE, + str(new_level_domain), ldb.FLAG_MOD_REPLACE, "msDS-Behavior-Version") try: samdb.modify(m) @@ -1267,7 +1267,7 @@ class cmd_domain_level(Command): m = ldb.Message() m.dn = ldb.Dn(samdb, "CN=Partitions,%s" % samdb.get_config_basedn()) m["msDS-Behavior-Version"]= ldb.MessageElement( - str(new_level_forest), ldb.FLAG_MOD_REPLACE, + str(new_level_forest), ldb.FLAG_MOD_REPLACE, "msDS-Behavior-Version") samdb.modify(m) msgs.append("Forest function level changed!") @@ -2098,7 +2098,7 @@ class cmd_domain_trust_list(DomainTrustCommand): } takes_options = [ - ] + ] def run(self, sambaopts=None, versionopts=None, localdcopts=None): @@ -2143,7 +2143,7 @@ class cmd_domain_trust_show(DomainTrustCommand): } takes_options = [ - ] + ] takes_args = ["domain"] @@ -2286,7 +2286,7 @@ class cmd_domain_trust_create(DomainTrustCommand): help="Skip validation of the trust.", dest='validate', default=True), - ] + ] takes_args = ["domain"] @@ -2782,7 +2782,7 @@ class cmd_domain_trust_delete(DomainTrustCommand): help="Where to delete the trusted domain object: 'local' or 'both'.", dest='delete_location', default="both"), - ] + ] takes_args = ["domain"] @@ -2939,7 +2939,7 @@ class cmd_domain_trust_validate(DomainTrustCommand): help="Where to validate the trusted domain object: 'local' or 'both'.", dest='validate_location', default="both"), - ] + ] takes_args = ["domain"] @@ -3162,7 +3162,7 @@ class cmd_domain_trust_namespaces(DomainTrustCommand): help="Delete an existing msDS-SPNSuffixes attribute of the local forest. Can be specified multiple times.", dest='delete_spn', default=[]), - ] + ] takes_args = ["domain?"] diff --git a/python/samba/netcmd/domain_backup.py b/python/samba/netcmd/domain_backup.py index ae04ec1d2c4..c2571e9cd75 100644 --- a/python/samba/netcmd/domain_backup.py +++ b/python/samba/netcmd/domain_backup.py @@ -208,7 +208,7 @@ class cmd_domain_backup_online(samba.netcmd.Command): help="Directory to write the backup file to"), Option("--no-secrets", action="store_true", default=False, help="Exclude secret values from the backup created") - ] + ] def run(self, sambaopts=None, credopts=None, server=None, targetdir=None, no_secrets=False): @@ -585,7 +585,7 @@ class cmd_domain_backup_rename(samba.netcmd.Command): help="Retain the DNS entries for the old realm in the backup"), Option("--no-secrets", action="store_true", default=False, help="Exclude secret values from the backup created") - ] + ] takes_args = ["new_domain_name", "new_dns_realm"] diff --git a/python/samba/netcmd/drs.py b/python/samba/netcmd/drs.py index 8259af60069..7ed0486c73a 100644 --- a/python/samba/netcmd/drs.py +++ b/python/samba/netcmd/drs.py @@ -753,7 +753,7 @@ class cmd_drs_clone_dc_database(Command): Option("-q", "--quiet", help="Be quiet", action="store_true"), Option("--include-secrets", help="Also replicate secret values", action="store_true"), Option("-v", "--verbose", help="Be verbose", action="store_true") - ] + ] takes_args = ["domain"] diff --git a/python/samba/netcmd/user.py b/python/samba/netcmd/user.py index 2131c68a0c7..9780f094931 100644 --- a/python/samba/netcmd/user.py +++ b/python/samba/netcmd/user.py @@ -1751,7 +1751,7 @@ samba-tool user syncpasswords --terminate \\ dirsync_filter = "(&" + \ "(objectClass=user)" + \ "(userAccountControl:%s:=%u)" % ( - ldb.OID_COMPARATOR_AND, dsdb.UF_NORMAL_ACCOUNT) + \ + ldb.OID_COMPARATOR_AND, dsdb.UF_NORMAL_ACCOUNT) + \ "(!(sAMAccountName=krbtgt*))" + \ ")" diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index dd875f8065a..9daa6514266 100644 --- a/python/samba/provision/__init__.py +++ b/python/samba/provision/__init__.py @@ -225,7 +225,7 @@ def find_provision_key_parameters(samdb, secretsdb, idmapdb, paths, smbconf, raise ProvisioningError(("basedn in %s (%s) and from %s (%s)" "is not the same ..." % (paths.samdb, str(current[0]["defaultNamingContext"][0].decode('utf8')), - paths.smbconf, basedn))) + paths.smbconf, basedn))) names.domaindn=current[0]["defaultNamingContext"][0] names.rootdn=current[0]["rootDomainNamingContext"][0] @@ -2042,7 +2042,7 @@ def provision_fake_ypserver(logger, samdb, domaindn, netbiosname, nisdomain, "DOMAINDN": domaindn, "NETBIOSNAME": netbiosname, "NISDOMAIN": nisdomain, - }) + }) except: samdb.transaction_cancel() raise diff --git a/python/samba/samdb.py b/python/samba/samdb.py index e0c29d8217d..0ed26aa0421 100644 --- a/python/samba/samdb.py +++ b/python/samba/samdb.py @@ -609,7 +609,7 @@ unicodePwd:: %s if force_change_at_next_login: self.force_password_change_at_next_login( - "(distinguishedName=" + str(user_dn) + ")") + "(distinguishedName=" + str(user_dn) + ")") # modify the userAccountControl to remove the disabled bit self.enable_account(search_filter) diff --git a/python/samba/schema.py b/python/samba/schema.py index c5537080296..cf3243a89f9 100644 --- a/python/samba/schema.py +++ b/python/samba/schema.py @@ -64,7 +64,7 @@ class Schema(object): # the schema files (and corresponding object version) that we know about base_schemas = { - "2008_R2_old" : ("MS-AD_Schema_2K8_R2_Attributes.txt", + "2008_R2_old" : ("MS-AD_Schema_2K8_R2_Attributes.txt", "MS-AD_Schema_2K8_R2_Classes.txt", 47), "2008_R2" : ("Attributes_for_AD_DS__Windows_Server_2008_R2.ldf", |