sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

Fix PEP8 warning E231 missing whitespace after ','

Browse Source 
Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
This commit is contained in:
Tim Beale 2018-07-27 13:12:28 +12:00 committed by Andrew Bartlett
parent e741a1939c
commit 092130be0f
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/samba/netcmd/pso.py
View File

@ -236,9 +236,9 @@ def check_pso_constraints(min_pwd_length=None, history_length=None,
# the same args are used for both create and set commands
pwd_settings_options = [
Option("--complexity", type="choice", choices=["on","off"],
Option("--complexity", type="choice", choices=["on", "off"],
help="The password complexity (on | off)."),
Option("--store-plaintext", type="choice", choices=["on","off"],
Option("--store-plaintext", type="choice", choices=["on", "off"],
help="Store plaintext passwords where account have 'store passwords with reversible encryption' set (on | off)."),
Option("--history-length",
help="The password history length (<integer>).", type=int),

26
python/samba/tests/samba_tool/passwordsettings.py
View File

@ -116,7 +116,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest):
self.obj_cleanup.append("CN=%s,%s" % (pso_name, self.pso_container))
self.assertCmdSuccess(result, out, err)
self.assertEquals(err,"","Shouldn't be any error messages")
self.assertEquals(err, "", "Shouldn't be any error messages")
self.assertIn("successfully created", out)
self.check_pso(pso_name, expected_pso)
@ -158,7 +158,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest):
self.user_auth)
self.obj_cleanup.append("CN=%s,%s" % (pso_name, self.pso_container))
self.assertCmdSuccess(result, out, err)
self.assertEquals(err,"","Shouldn't be any error messages")
self.assertEquals(err, "", "Shouldn't be any error messages")
self.assertIn("successfully created", out)
self.check_pso(pso_name, expected_pso)
@ -190,7 +190,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest):
# sanity-check the cmd was successful
self.assertCmdSuccess(result, out, err)
self.assertEquals(err,"","Shouldn't be any error messages")
self.assertEquals(err, "", "Shouldn't be any error messages")
self.assertIn("successfully created", out)
self.check_pso(pso_name, pso_settings)
@ -214,7 +214,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest):
"-H", self.server,
self.user_auth)
self.assertCmdSuccess(result, out, err)
self.assertEquals(err,"","Shouldn't be any error messages")
self.assertEquals(err, "", "Shouldn't be any error messages")
self.assertIn("Successfully updated", out)
# check the PSO's settings now reflect the new values
@ -232,7 +232,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest):
"-H", self.server,
self.user_auth)
self.assertCmdSuccess(result, out, err)
self.assertEquals(err,"","Shouldn't be any error messages")
self.assertEquals(err, "", "Shouldn't be any error messages")
self.assertIn("Deleted PSO", out)
dn = "CN=%s,%s" % (pso_name, self.pso_container)
self.obj_cleanup.remove(dn)
@ -262,7 +262,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest):
"-H", self.server,
self.user_auth)
self.assertCmdSuccess(result, out, err)
self.assertEquals(err,"","Shouldn't be any error messages")
self.assertEquals(err, "", "Shouldn't be any error messages")
if pso is None:
self.assertIn("No PSO applies to user", out)
else:
@ -302,7 +302,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest):
group_name, "-H", self.server,
self.user_auth)
self.assertCmdSuccess(result, out, err)
self.assertEquals(err,"","Shouldn't be any error messages")
self.assertEquals(err, "", "Shouldn't be any error messages")
self.check_pso_applied(user, pso=test_pso)
# we should fail if we try to apply the same PSO/group twice though
@ -319,7 +319,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest):
user.name, "-H", self.server,
self.user_auth)
self.assertCmdSuccess(result, out, err)
self.assertEquals(err,"","Shouldn't be any error messages")
self.assertEquals(err, "", "Shouldn't be any error messages")
self.check_pso_applied(user, pso=test_pso)
# check samba-tool can successfully unlink a group from a PSO
@ -328,7 +328,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest):
group_name, "-H", self.server,
self.user_auth)
self.assertCmdSuccess(result, out, err)
self.assertEquals(err,"","Shouldn't be any error messages")
self.assertEquals(err, "", "Shouldn't be any error messages")
# PSO still applies directly to the user, even though group was removed
self.check_pso_applied(user, pso=test_pso)
@ -338,7 +338,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest):
user.name, "-H", self.server,
self.user_auth)
self.assertCmdSuccess(result, out, err)
self.assertEquals(err,"","Shouldn't be any error messages")
self.assertEquals(err, "", "Shouldn't be any error messages")
self.check_pso_applied(user, pso=None)
def test_pso_unpriv(self):
@ -410,7 +410,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest):
"show"), "-H", self.server,
self.user_auth)
self.assertCmdSuccess(result, out, err)
self.assertEquals(err,"","Shouldn't be any error messages")
self.assertEquals(err, "", "Shouldn't be any error messages")
# check an arbitrary setting is displayed correctly
min_pwd_len = self.ldb.get_minPwdLength()
@ -425,7 +425,7 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest):
"-H", self.server,
self.user_auth)
self.assertCmdSuccess(result, out, err)
self.assertEquals(err,"","Shouldn't be any error messages")
self.assertEquals(err, "", "Shouldn't be any error messages")
self.assertIn("successful", out)
self.assertEquals(new_len, self.ldb.get_minPwdLength())
@ -434,6 +434,6 @@ class PwdSettingsCmdTestCase(SambaToolCmdTest):
"show"), "-H", self.server,
self.user_auth)
self.assertCmdSuccess(result, out, err)
self.assertEquals(err,"","Shouldn't be any error messages")
self.assertEquals(err, "", "Shouldn't be any error messages")
self.assertIn("Minimum password length: %u" % new_len, out)