From 24fe85041f053dd6f835a3a99afa7169a8cc0654 Mon Sep 17 00:00:00 2001 From: Joe Guo Date: Tue, 4 Sep 2018 01:05:26 +1200 Subject: [PATCH] PEP8: fix E122: continuation line missing indentation or outdented Signed-off-by: Joe Guo Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- python/samba/join.py | 2 +- python/samba/netcmd/domain.py | 8 ++--- python/samba/netcmd/schema.py | 4 +-- python/samba/netcmd/user.py | 2 +- python/samba/provision/__init__.py | 34 +++++++++---------- python/samba/schema.py | 2 +- python/samba/tests/dckeytab.py | 4 +-- source4/dsdb/tests/python/acl.py | 2 +- source4/scripting/devel/repl_cleartext_pwd.py | 4 +-- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/python/samba/join.py b/python/samba/join.py index e7963eeaa1e..793cab536ed 100644 --- a/python/samba/join.py +++ b/python/samba/join.py @@ -1045,7 +1045,7 @@ class DCJoinContext(object): client_version = dnsserver.DNS_CLIENT_VERSION_LONGHORN record_type = dnsp.DNS_TYPE_A select_flags = dnsserver.DNS_RPC_VIEW_AUTHORITY_DATA |\ - dnsserver.DNS_RPC_VIEW_NO_CHILDREN + dnsserver.DNS_RPC_VIEW_NO_CHILDREN zone = ctx.dnsdomain msdcs_zone = "_msdcs.%s" % ctx.dnsforest diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index 56386c579c1..fd1a8043838 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -2487,7 +2487,7 @@ class cmd_domain_trust_create(DomainTrustCommand): if not self.check_runtime_error(error, ntstatus.NT_STATUS_OBJECT_NAME_NOT_FOUND): raise self.LocalRuntimeError(self, error, "QueryTrustedDomainInfoByName(%s, FULL_INFO) failed" % ( - lsaString.string)) + lsaString.string)) try: lsaString.string = local_trust_info.netbios_name.string @@ -2500,7 +2500,7 @@ class cmd_domain_trust_create(DomainTrustCommand): if not self.check_runtime_error(error, ntstatus.NT_STATUS_OBJECT_NAME_NOT_FOUND): raise self.LocalRuntimeError(self, error, "QueryTrustedDomainInfoByName(%s, FULL_INFO) failed" % ( - lsaString.string)) + lsaString.string)) if remote_trust_info: try: @@ -2514,7 +2514,7 @@ class cmd_domain_trust_create(DomainTrustCommand): if not self.check_runtime_error(error, ntstatus.NT_STATUS_OBJECT_NAME_NOT_FOUND): raise self.RemoteRuntimeError(self, error, "QueryTrustedDomainInfoByName(%s, FULL_INFO) failed" % ( - lsaString.string)) + lsaString.string)) try: lsaString.string = remote_trust_info.netbios_name.string @@ -2527,7 +2527,7 @@ class cmd_domain_trust_create(DomainTrustCommand): if not self.check_runtime_error(error, ntstatus.NT_STATUS_OBJECT_NAME_NOT_FOUND): raise self.RemoteRuntimeError(self, error, "QueryTrustedDomainInfoByName(%s, FULL_INFO) failed" % ( - lsaString.string)) + lsaString.string)) try: local_netlogon = self.new_local_netlogon_connection() diff --git a/python/samba/netcmd/schema.py b/python/samba/netcmd/schema.py index 5768169c4c3..889dd3fb539 100644 --- a/python/samba/netcmd/schema.py +++ b/python/samba/netcmd/schema.py @@ -237,9 +237,9 @@ class cmd_schema_attribute_show_oc(Command): schema_dn = samdb.schema_dn() may_filt = '(&(objectClass=classSchema)' \ - '(|(mayContain={0})(systemMayContain={0})))'.format(attribute) + '(|(mayContain={0})(systemMayContain={0})))'.format(attribute) must_filt = '(&(objectClass=classSchema)' \ - '(|(mustContain={0})(systemMustContain={0})))'.format(attribute) + '(|(mustContain={0})(systemMustContain={0})))'.format(attribute) may_res = samdb.search(base=schema_dn, scope=ldb.SCOPE_SUBTREE, expression=may_filt, attrs=['cn']) diff --git a/python/samba/netcmd/user.py b/python/samba/netcmd/user.py index 18eb0e0a70b..ab3d13deb71 100644 --- a/python/samba/netcmd/user.py +++ b/python/samba/netcmd/user.py @@ -66,7 +66,7 @@ try: except ImportError as e: gpgme_support = False decrypt_samba_gpg_help = "Decrypt the SambaGPG password not supported, " + \ - "python-gpgme required" + "python-gpgme required" disabled_virtual_attributes = { } diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index 9ecb2018060..bf16c073857 100644 --- a/python/samba/provision/__init__.py +++ b/python/samba/provision/__init__.py @@ -1032,16 +1032,16 @@ def setup_secretsdb(paths, session_info, backend_credentials, lp): if backend_credentials.get_bind_dn() is not None: setup_add_ldif(secrets_ldb, setup_path("secrets_simple_ldap.ldif"), { - "LDAPMANAGERDN": backend_credentials.get_bind_dn(), - "LDAPMANAGERPASS_B64": b64encode(backend_credentials.get_password()).decode('utf8') - }) + "LDAPMANAGERDN": backend_credentials.get_bind_dn(), + "LDAPMANAGERPASS_B64": b64encode(backend_credentials.get_password()).decode('utf8') + }) else: setup_add_ldif(secrets_ldb, setup_path("secrets_sasl_ldap.ldif"), { - "LDAPADMINUSER": backend_credentials.get_username(), - "LDAPADMINREALM": backend_credentials.get_realm(), - "LDAPADMINPASS_B64": b64encode(backend_credentials.get_password()).decode('utf8') - }) + "LDAPADMINUSER": backend_credentials.get_username(), + "LDAPADMINREALM": backend_credentials.get_realm(), + "LDAPADMINPASS_B64": b64encode(backend_credentials.get_password()).decode('utf8') + }) except: secrets_ldb.transaction_cancel() raise @@ -1196,12 +1196,12 @@ def setup_self_join(samdb, admin_session_info, names, fill, machinepass, # Setup fSMORoleOwner entries to point at the newly created DC entry setup_modify_ldif(samdb, setup_path("provision_self_join_modify_config.ldif"), { - "CONFIGDN": names.configdn, - "SCHEMADN": names.schemadn, - "DEFAULTSITE": names.sitename, - "NETBIOSNAME": names.netbiosname, - "SERVERDN": names.serverdn, - }) + "CONFIGDN": names.configdn, + "SCHEMADN": names.schemadn, + "DEFAULTSITE": names.sitename, + "NETBIOSNAME": names.netbiosname, + "SERVERDN": names.serverdn, + }) system_session_info = system_session() samdb.set_session_info(system_session_info) @@ -1484,9 +1484,9 @@ def fill_samdb(samdb, lp, names, logger, policyguid, logger.info("Modifying display specifiers and extended rights") setup_modify_ldif(samdb, setup_path("provision_configuration_modify.ldif"), { - "CONFIGDN": names.configdn, - "DISPLAYSPECIFIERS_DESCRIPTOR": protected2_descr - }) + "CONFIGDN": names.configdn, + "DISPLAYSPECIFIERS_DESCRIPTOR": protected2_descr + }) logger.info("Adding users container") users_desc = b64encode(get_domain_users_descriptor(names.domainsid)).decode('utf8') @@ -1506,7 +1506,7 @@ def fill_samdb(samdb, lp, names, logger, policyguid, logger.info("Modifying computers container") setup_modify_ldif(samdb, setup_path("provision_computers_modify.ldif"), { - "DOMAINDN": names.domaindn}) + "DOMAINDN": names.domaindn}) logger.info("Setting up sam.ldb data") infrastructure_desc = b64encode(get_domain_infrastructure_descriptor(names.domainsid)).decode('utf8') lostandfound_desc = b64encode(get_domain_delete_protected2_descriptor(names.domainsid)).decode('utf8') diff --git a/python/samba/schema.py b/python/samba/schema.py index 918f3f7ecc0..44e0e6364b4 100644 --- a/python/samba/schema.py +++ b/python/samba/schema.py @@ -172,7 +172,7 @@ dn: @INDEXLIST """) schema_dn_add = self.schema_dn_add \ - + "objectGUID: 24e2ca70-b093-4ae8-84c0-2d7ac652a1b8\n" + + "objectGUID: 24e2ca70-b093-4ae8-84c0-2d7ac652a1b8\n" # These bits of LDIF are supplied when the Schema object is created self.ldb.add_ldif(schema_dn_add) diff --git a/python/samba/tests/dckeytab.py b/python/samba/tests/dckeytab.py index 3149828c4dd..cdb8c5151e7 100644 --- a/python/samba/tests/dckeytab.py +++ b/python/samba/tests/dckeytab.py @@ -56,5 +56,5 @@ class DCKeytabTests(tests.TestCase): result += c principal_parts = self.principal.split('@') assert principal_parts[0] in result and \ - principal_parts[1] in result, \ - 'Principal not found in generated keytab' + principal_parts[1] in result, \ + 'Principal not found in generated keytab' diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py index 48bdd2aece2..0ab38846566 100755 --- a/source4/dsdb/tests/python/acl.py +++ b/source4/dsdb/tests/python/acl.py @@ -169,7 +169,7 @@ class AclAddTests(AclTests): def assert_top_ou_deleted(self): res = self.ldb_admin.search(self.base_dn, expression="(distinguishedName=%s,%s)" % ( - "OU=test_add_ou1", self.base_dn)) + "OU=test_add_ou1", self.base_dn)) self.assertEqual(len(res), 0) def test_add_u1(self): diff --git a/source4/scripting/devel/repl_cleartext_pwd.py b/source4/scripting/devel/repl_cleartext_pwd.py index fc90589269e..630a2f524b7 100755 --- a/source4/scripting/devel/repl_cleartext_pwd.py +++ b/source4/scripting/devel/repl_cleartext_pwd.py @@ -137,7 +137,7 @@ if __name__ == "__main__": store_dn_len, store_dn_ofs, store_hwm_len, store_hwm_ofs, store_utdv_len, store_utdv_ofs) = \ - struct.unpack("