PEP8: fix E122: continuation line missing indentation or outdented

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/join.py b/python/samba/join.py
index e7963eeaa1e1ddcb65831abb11ad4b7f8be2e1b2..793cab536edba54298f23f22ef6db2b126e72b88 100644 (file)
--- 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 56386c579c1be1e4e26a36264383ccee656b3d46..fd1a8043838529e182e2e401979908fb67ce9ff0 100644 (file)
--- 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 5768169c4c375d23179c4b64410b97e5a0207d32..889dd3fb53972bd21ffb2092f22856de7f4ef6d8 100644 (file)
--- 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 18eb0e0a70b8188af6b4f97034c596bd41473e39..ab3d13deb71a789f74b2eb3f9f6ad74bed5618f8 100644 (file)
--- 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 9ecb2018060e949f11b946528e41cd814e74bef3..bf16c0738571e58d6257d4d4a052f9fe3dce37d0 100644 (file)
--- 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 918f3f7ecc0585cdf482c18b23c356c04d82085c..44e0e6364b4a50fe153487c3713279a1989027cc 100644 (file)
--- 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 3149828c4dd79ec0469499a40600fc5ea6279400..cdb8c5151e7327ebbf590275c646edd0a4d9fa53 100644 (file)
--- 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 48bdd2aece2e2cea6ac21d5f9c1ea81728562fd3..0ab388465668d4a6984bd294ee6a37900cc284e8 100755 (executable)
--- 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 fc90589269e5fec233903d88bd05b6b3b04a24a0..630a2f524b7c5d44a719fb902b05c5a838bbdd86 100755 (executable)
--- 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("<LLLLLLL", store_hdr)
+            struct.unpack("<LLLLLLL", store_hdr)
 
         store_dn = store_blob[store_dn_ofs:store_dn_ofs + store_dn_len]
         store_hwm_blob = store_blob[store_hwm_ofs:store_hwm_ofs + store_hwm_len]
@@ -399,7 +399,7 @@ if __name__ == "__main__":
                                      len(dn), dn_ofs,
                                      len(store_hwm_blob), hwm_ofs,
                                      len(store_utdv_blob), utdv_ofs) + \
-            dn + store_hwm_blob + store_utdv_blob
+                dn + store_hwm_blob + store_utdv_blob
 
             tmp_file = "%s.tmp" % cookie_file
             f = open(tmp_file, 'wb')