From 9b86c5f8bc0eec4d0b818430adea6195bfa6922c Mon Sep 17 00:00:00 2001 From: Tim Beale Date: Fri, 27 Jul 2018 12:50:41 +1200 Subject: [PATCH] Fix PEP8 warning E122/E126/E127 wrong indent for continuation lines Signed-off-by: Tim Beale Reviewed-by: Andrew Bartlett Reviewed-by: Douglas Bagnall --- python/samba/netcmd/pso.py | 31 +++++++++++------------ python/samba/tests/samba_tool/passwordsettings.py | 2 +- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/python/samba/netcmd/pso.py b/python/samba/netcmd/pso.py index 32efea33d67..c06f55cb62b 100644 --- a/python/samba/netcmd/pso.py +++ b/python/samba/netcmd/pso.py @@ -254,8 +254,7 @@ pwd_settings_options = [ Option("--account-lockout-threshold", help="The number of bad password attempts allowed before locking out the account (). Default is domain setting.", type=int), Option("--reset-account-lockout-after", - help="After this time is elapsed, the recorded number of attempts restarts from zero (). Default is domain setting.", type=int), - ] + help="After this time is elapsed, the recorded number of attempts restarts from zero (). Default is domain setting.", type=int)] def num_options_in_args(options, args): """ @@ -298,8 +297,8 @@ class cmd_domain_pwdsettings_pso_create(Command): } takes_options = pwd_settings_options + [ - Option("-H", "--URL", help="LDB URL for database or target server", type=str, - metavar="URL", dest="H"), + Option("-H", "--URL", help="LDB URL for database or target server", type=str, + metavar="URL", dest="H") ] takes_args = ["psoname", "precedence"] @@ -500,8 +499,8 @@ class cmd_domain_pwdsettings_pso_delete(Command): } takes_options = [ - Option("-H", "--URL", help="LDB URL for database or target server", type=str, - metavar="URL", dest="H"), + Option("-H", "--URL", help="LDB URL for database or target server", type=str, + metavar="URL", dest="H") ] takes_args = ["psoname"] @@ -539,8 +538,8 @@ class cmd_domain_pwdsettings_pso_list(Command): } takes_options = [ - Option("-H", "--URL", help="LDB URL for database or target server", type=str, - metavar="URL", dest="H"), + Option("-H", "--URL", help="LDB URL for database or target server", type=str, + metavar="URL", dest="H") ] def run(self, H=None, credopts=None, sambaopts=None, versionopts=None): @@ -582,8 +581,8 @@ class cmd_domain_pwdsettings_pso_show(Command): } takes_options = [ - Option("-H", "--URL", help="LDB URL for database or target server", type=str, - metavar="URL", dest="H"), + Option("-H", "--URL", help="LDB URL for database or target server", type=str, + metavar="URL", dest="H") ] takes_args = ["psoname"] @@ -612,8 +611,8 @@ class cmd_domain_pwdsettings_pso_show_user(Command): } takes_options = [ - Option("-H", "--URL", help="LDB URL for database or target server", type=str, - metavar="URL", dest="H"), + Option("-H", "--URL", help="LDB URL for database or target server", type=str, + metavar="URL", dest="H") ] takes_args = ["username"] @@ -648,8 +647,8 @@ class cmd_domain_pwdsettings_pso_apply(Command): } takes_options = [ - Option("-H", "--URL", help="LDB URL for database or target server", type=str, - metavar="URL", dest="H"), + Option("-H", "--URL", help="LDB URL for database or target server", type=str, + metavar="URL", dest="H") ] takes_args = ["psoname", "user_or_group"] @@ -707,8 +706,8 @@ class cmd_domain_pwdsettings_pso_unapply(Command): } takes_options = [ - Option("-H", "--URL", help="LDB URL for database or target server", type=str, - metavar="URL", dest="H"), + Option("-H", "--URL", help="LDB URL for database or target server", type=str, + metavar="URL", dest="H"), ] takes_args = ["psoname", "user_or_group"] diff --git a/python/samba/tests/samba_tool/passwordsettings.py b/python/samba/tests/samba_tool/passwordsettings.py index 627a338e747..89abfa019d8 100644 --- a/python/samba/tests/samba_tool/passwordsettings.py +++ b/python/samba/tests/samba_tool/passwordsettings.py @@ -31,7 +31,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest): os.environ["DC_PASSWORD"]) self.ldb = self.getSamDB("-H", self.server, self.user_auth) self.pso_container = \ - "CN=Password Settings Container,CN=System,%s" % self.ldb.domain_dn() + "CN=Password Settings Container,CN=System,%s" % self.ldb.domain_dn() self.obj_cleanup = [] def tearDown(self): -- 2.11.4.GIT