PEP8: fix E123: closing bracket does not match indentation of opening bracket's line
authorJoe Guo <joeg@catalyst.net.nz>
Mon, 3 Sep 2018 13:05:31 +0000 (01:05 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 6 Sep 2018 10:10:12 +0000 (12:10 +0200)
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>
python/samba/netcmd/domain.py
python/samba/netcmd/domain_backup.py
python/samba/netcmd/gpo.py
python/samba/provision/__init__.py

index fd1a8043838529e182e2e401979908fb67ce9ff0..e90266d6a1951bcd184515ca86464dff594eca70 100644 (file)
@@ -1066,7 +1066,7 @@ class cmd_domain_level(Command):
                help="The forest function level (2003 | 2008 | 2008_R2 | 2012 | 2012_R2)"),
         Option("--domain-level", type="choice", choices=["2003", "2008", "2008_R2", "2012", "2012_R2"],
                help="The domain function level (2003 | 2008 | 2008_R2 | 2012 | 2012_R2)")
                help="The forest function level (2003 | 2008 | 2008_R2 | 2012 | 2012_R2)"),
         Option("--domain-level", type="choice", choices=["2003", "2008", "2008_R2", "2012", "2012_R2"],
                help="The domain function level (2003 | 2008 | 2008_R2 | 2012 | 2012_R2)")
-        ]
+    ]
 
     takes_args = ["subcommand"]
 
 
     takes_args = ["subcommand"]
 
@@ -1389,7 +1389,7 @@ class cmd_domain_passwordsettings_set(Command):
                help="The number of bad password attempts allowed before locking out the account (<integer> | default).  Default is 0 (never lock out).", type=str),
         Option("--reset-account-lockout-after",
                help="After this time is elapsed, the recorded number of attempts restarts from zero (<integer> | default).  Default is 30.", type=str),
                help="The number of bad password attempts allowed before locking out the account (<integer> | default).  Default is 0 (never lock out).", type=str),
         Option("--reset-account-lockout-after",
                help="After this time is elapsed, the recorded number of attempts restarts from zero (<integer> | default).  Default is 30.", type=str),
-        ]
+    ]
 
     def run(self, H=None, min_pwd_age=None, max_pwd_age=None,
             quiet=False, complexity=None, store_plaintext=None, history_length=None,
 
     def run(self, H=None, min_pwd_age=None, max_pwd_age=None,
             quiet=False, complexity=None, store_plaintext=None, history_length=None,
index de53c6e5113c79642d9c67a5dc758c102fefde73..bff2bdda783c9b3e5ae969d0d30f4cdedd6ba89f 100644 (file)
@@ -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")
                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):
 
     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")
                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"]
 
 
     takes_args = ["new_domain_name", "new_dns_realm"]
 
index d0b94ffacc1b26a48c2ffe0df769e253e2785923..13a7802b5ae90b860bad957ad8bc8f0639d57051 100644 (file)
@@ -980,7 +980,7 @@ class cmd_backup(Command):
                default=False, action='store_true'),
         Option("--entities", help="File to export defining XML entities for the restore",
                dest='ent_file', type=str)
                default=False, action='store_true'),
         Option("--entities", help="File to export defining XML entities for the restore",
                dest='ent_file', type=str)
-        ]
+    ]
 
     def run(self, gpo, H=None, tmpdir=None, generalize=False, sambaopts=None,
             credopts=None, versionopts=None, ent_file=None):
 
     def run(self, gpo, H=None, tmpdir=None, generalize=False, sambaopts=None,
             credopts=None, versionopts=None, ent_file=None):
@@ -1284,7 +1284,7 @@ class cmd_restore(cmd_create):
         Option("-H", help="LDB URL for database or target server", type=str),
         Option("--tmpdir", help="Temporary directory for copying policy files", type=str),
         Option("--entities", help="File defining XML entities to insert into DOCTYPE header", type=str)
         Option("-H", help="LDB URL for database or target server", type=str),
         Option("--tmpdir", help="Temporary directory for copying policy files", type=str),
         Option("--entities", help="File defining XML entities to insert into DOCTYPE header", type=str)
-        ]
+    ]
 
     def restore_from_backup_to_local_dir(self, sourcedir, targetdir, dtd_header=''):
         SUFFIX = '.SAMBABACKUP'
 
     def restore_from_backup_to_local_dir(self, sourcedir, targetdir, dtd_header=''):
         SUFFIX = '.SAMBABACKUP'
index bf16c0738571e58d6257d4d4a052f9fe3dce37d0..66f69ce9c3f9cbb7e2beb3b0d2684e4201a9f678 100644 (file)
@@ -1034,14 +1034,14 @@ def setup_secretsdb(paths, session_info, backend_credentials, lp):
                                setup_path("secrets_simple_ldap.ldif"), {
                                    "LDAPMANAGERDN": backend_credentials.get_bind_dn(),
                                    "LDAPMANAGERPASS_B64": b64encode(backend_credentials.get_password()).decode('utf8')
                                setup_path("secrets_simple_ldap.ldif"), {
                                    "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')
             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')
-                                   })
+                               })
     except:
         secrets_ldb.transaction_cancel()
         raise
     except:
         secrets_ldb.transaction_cancel()
         raise
@@ -1201,7 +1201,7 @@ def setup_self_join(samdb, admin_session_info, names, fill, machinepass,
                               "DEFAULTSITE": names.sitename,
                               "NETBIOSNAME": names.netbiosname,
                               "SERVERDN": names.serverdn,
                               "DEFAULTSITE": names.sitename,
                               "NETBIOSNAME": names.netbiosname,
                               "SERVERDN": names.serverdn,
-                              })
+                          })
 
     system_session_info = system_session()
     samdb.set_session_info(system_session_info)
 
     system_session_info = system_session()
     samdb.set_session_info(system_session_info)
@@ -1486,7 +1486,7 @@ def fill_samdb(samdb, lp, names, logger, policyguid,
                           setup_path("provision_configuration_modify.ldif"), {
                               "CONFIGDN": names.configdn,
                               "DISPLAYSPECIFIERS_DESCRIPTOR": protected2_descr
                           setup_path("provision_configuration_modify.ldif"), {
                               "CONFIGDN": names.configdn,
                               "DISPLAYSPECIFIERS_DESCRIPTOR": protected2_descr
-                              })
+                          })
 
     logger.info("Adding users container")
     users_desc = b64encode(get_domain_users_descriptor(names.domainsid)).decode('utf8')
 
     logger.info("Adding users container")
     users_desc = b64encode(get_domain_users_descriptor(names.domainsid)).decode('utf8')