From: Joe Guo Date: Mon, 3 Sep 2018 13:05:31 +0000 (+1200) Subject: PEP8: fix E123: closing bracket does not match indentation of opening bracket's line X-Git-Tag: tdb-1.3.17~1730 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8678fde5821b524578dab0fa7db097b9e5148af2;p=thirdparty%2Fsamba.git PEP8: fix E123: closing bracket does not match indentation of opening bracket's line Signed-off-by: Joe Guo Reviewed-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index fd1a8043838..e90266d6a19 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -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)") - ] + ] 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 ( | 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 ( | 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, diff --git a/python/samba/netcmd/domain_backup.py b/python/samba/netcmd/domain_backup.py index de53c6e5113..bff2bdda783 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/gpo.py b/python/samba/netcmd/gpo.py index d0b94ffacc1..13a7802b5ae 100644 --- a/python/samba/netcmd/gpo.py +++ b/python/samba/netcmd/gpo.py @@ -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) - ] + ] 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) - ] + ] def restore_from_backup_to_local_dir(self, sourcedir, targetdir, dtd_header=''): SUFFIX = '.SAMBABACKUP' diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index bf16c073857..66f69ce9c3f 100644 --- a/python/samba/provision/__init__.py +++ b/python/samba/provision/__init__.py @@ -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') - }) + }) 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 @@ -1201,7 +1201,7 @@ def setup_self_join(samdb, admin_session_info, names, fill, machinepass, "DEFAULTSITE": names.sitename, "NETBIOSNAME": names.netbiosname, "SERVERDN": names.serverdn, - }) + }) 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 - }) + }) logger.info("Adding users container") users_desc = b64encode(get_domain_users_descriptor(names.domainsid)).decode('utf8')