diff options
author | Joe Guo <joeg@catalyst.net.nz> | 2018-07-30 18:19:11 +1200 |
---|---|---|
committer | Douglas Bagnall <dbagnall@samba.org> | 2018-08-24 07:49:28 +0200 |
commit | 40ef91fb410e609c1dc02d95daeafbd5f7ef28a9 (patch) | |
tree | 9d6d1345cea9be405604187f7b32343e53f9c5a9 /python/samba | |
parent | 12d3fbe15cb58b57c60499103101e3a845378859 (diff) | |
download | samba-40ef91fb410e609c1dc02d95daeafbd5f7ef28a9.tar.gz |
PEP8: fix E241: multiple spaces after ','
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'python/samba')
-rw-r--r-- | python/samba/emulate/traffic.py | 10 | ||||
-rw-r--r-- | python/samba/netcmd/drs.py | 64 | ||||
-rw-r--r-- | python/samba/netcmd/spn.py | 2 | ||||
-rw-r--r-- | python/samba/netcmd/visualize.py | 2 | ||||
-rw-r--r-- | python/samba/provision/__init__.py | 2 | ||||
-rw-r--r-- | python/samba/tests/auth_log.py | 4 | ||||
-rw-r--r-- | python/samba/tests/dcerpc/dnsserver.py | 4 | ||||
-rw-r--r-- | python/samba/tests/password_hash.py | 2 | ||||
-rw-r--r-- | python/samba/tests/samba_tool/dnscmd.py | 4 | ||||
-rw-r--r-- | python/samba/tests/samba_tool/ntacl.py | 4 | ||||
-rw-r--r-- | python/samba/tests/samba_tool/user_wdigest.py | 2 |
11 files changed, 50 insertions, 50 deletions
diff --git a/python/samba/emulate/traffic.py b/python/samba/emulate/traffic.py index 27a5bbf97ba..a60ebbba9e2 100644 --- a/python/samba/emulate/traffic.py +++ b/python/samba/emulate/traffic.py @@ -404,8 +404,8 @@ class ReplayContext(object): 'conversation-%d' % conversation.conversation_id) - self.lp.set("private dir", self.tempdir) - self.lp.set("lock dir", self.tempdir) + self.lp.set("private dir", self.tempdir) + self.lp.set("lock dir", self.tempdir) self.lp.set("state directory", self.tempdir) self.lp.set("tls verify peer", "no_check") @@ -1565,7 +1565,7 @@ def create_ou(ldb, instance_id): """ ou = ou_name(ldb, instance_id) try: - ldb.add({"dn": ou.split(',', 1)[1], + ldb.add({"dn": ou.split(',', 1)[1], "objectclass": "organizationalunit"}) except LdbError as e: (status, _) = e.args @@ -1573,7 +1573,7 @@ def create_ou(ldb, instance_id): if status != 68: raise try: - ldb.add({"dn": ou, + ldb.add({"dn": ou, "objectclass": "organizationalunit"}) except LdbError as e: (status, _) = e.args @@ -1692,7 +1692,7 @@ def create_user_account(ldb, instance_id, username, userpass): # grant user write permission to do things like write account SPN sdutils = sd_utils.SDUtils(ldb) - sdutils.dacl_add_ace(user_dn, "(A;;WP;;;PS)") + sdutils.dacl_add_ace(user_dn, "(A;;WP;;;PS)") end = time.time() duration = end - start diff --git a/python/samba/netcmd/drs.py b/python/samba/netcmd/drs.py index e8dbdd432f6..96660e678ef 100644 --- a/python/samba/netcmd/drs.py +++ b/python/samba/netcmd/drs.py @@ -605,39 +605,39 @@ class cmd_drs_bind(Command): (info, handle) = self.drsuapi.DsBind(misc.GUID(drsuapi.DRSUAPI_DS_BIND_GUID), bind_info) optmap = [ - ("DRSUAPI_SUPPORTED_EXTENSION_BASE", "DRS_EXT_BASE"), - ("DRSUAPI_SUPPORTED_EXTENSION_ASYNC_REPLICATION", "DRS_EXT_ASYNCREPL"), - ("DRSUAPI_SUPPORTED_EXTENSION_REMOVEAPI", "DRS_EXT_REMOVEAPI"), - ("DRSUAPI_SUPPORTED_EXTENSION_MOVEREQ_V2", "DRS_EXT_MOVEREQ_V2"), - ("DRSUAPI_SUPPORTED_EXTENSION_GETCHG_COMPRESS", "DRS_EXT_GETCHG_DEFLATE"), - ("DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V1", "DRS_EXT_DCINFO_V1"), - ("DRSUAPI_SUPPORTED_EXTENSION_RESTORE_USN_OPTIMIZATION", "DRS_EXT_RESTORE_USN_OPTIMIZATION"), - ("DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY", "DRS_EXT_ADDENTRY"), - ("DRSUAPI_SUPPORTED_EXTENSION_KCC_EXECUTE", "DRS_EXT_KCC_EXECUTE"), - ("DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY_V2", "DRS_EXT_ADDENTRY_V2"), - ("DRSUAPI_SUPPORTED_EXTENSION_LINKED_VALUE_REPLICATION", "DRS_EXT_LINKED_VALUE_REPLICATION"), - ("DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V2", "DRS_EXT_DCINFO_V2"), + ("DRSUAPI_SUPPORTED_EXTENSION_BASE", "DRS_EXT_BASE"), + ("DRSUAPI_SUPPORTED_EXTENSION_ASYNC_REPLICATION", "DRS_EXT_ASYNCREPL"), + ("DRSUAPI_SUPPORTED_EXTENSION_REMOVEAPI", "DRS_EXT_REMOVEAPI"), + ("DRSUAPI_SUPPORTED_EXTENSION_MOVEREQ_V2", "DRS_EXT_MOVEREQ_V2"), + ("DRSUAPI_SUPPORTED_EXTENSION_GETCHG_COMPRESS", "DRS_EXT_GETCHG_DEFLATE"), + ("DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V1", "DRS_EXT_DCINFO_V1"), + ("DRSUAPI_SUPPORTED_EXTENSION_RESTORE_USN_OPTIMIZATION", "DRS_EXT_RESTORE_USN_OPTIMIZATION"), + ("DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY", "DRS_EXT_ADDENTRY"), + ("DRSUAPI_SUPPORTED_EXTENSION_KCC_EXECUTE", "DRS_EXT_KCC_EXECUTE"), + ("DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY_V2", "DRS_EXT_ADDENTRY_V2"), + ("DRSUAPI_SUPPORTED_EXTENSION_LINKED_VALUE_REPLICATION", "DRS_EXT_LINKED_VALUE_REPLICATION"), + ("DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V2", "DRS_EXT_DCINFO_V2"), ("DRSUAPI_SUPPORTED_EXTENSION_INSTANCE_TYPE_NOT_REQ_ON_MOD", "DRS_EXT_INSTANCE_TYPE_NOT_REQ_ON_MOD"), - ("DRSUAPI_SUPPORTED_EXTENSION_CRYPTO_BIND", "DRS_EXT_CRYPTO_BIND"), - ("DRSUAPI_SUPPORTED_EXTENSION_GET_REPL_INFO", "DRS_EXT_GET_REPL_INFO"), - ("DRSUAPI_SUPPORTED_EXTENSION_STRONG_ENCRYPTION", "DRS_EXT_STRONG_ENCRYPTION"), - ("DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V01", "DRS_EXT_DCINFO_VFFFFFFFF"), - ("DRSUAPI_SUPPORTED_EXTENSION_TRANSITIVE_MEMBERSHIP", "DRS_EXT_TRANSITIVE_MEMBERSHIP"), - ("DRSUAPI_SUPPORTED_EXTENSION_ADD_SID_HISTORY", "DRS_EXT_ADD_SID_HISTORY"), - ("DRSUAPI_SUPPORTED_EXTENSION_POST_BETA3", "DRS_EXT_POST_BETA3"), - ("DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V5", "DRS_EXT_GETCHGREQ_V5"), - ("DRSUAPI_SUPPORTED_EXTENSION_GET_MEMBERSHIPS2", "DRS_EXT_GETMEMBERSHIPS2"), - ("DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V6", "DRS_EXT_GETCHGREQ_V6"), - ("DRSUAPI_SUPPORTED_EXTENSION_NONDOMAIN_NCS", "DRS_EXT_NONDOMAIN_NCS"), - ("DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V8", "DRS_EXT_GETCHGREQ_V8"), - ("DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V5", "DRS_EXT_GETCHGREPLY_V5"), - ("DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V6", "DRS_EXT_GETCHGREPLY_V6"), - ("DRSUAPI_SUPPORTED_EXTENSION_ADDENTRYREPLY_V3", "DRS_EXT_WHISTLER_BETA3"), - ("DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V7", "DRS_EXT_WHISTLER_BETA3"), - ("DRSUAPI_SUPPORTED_EXTENSION_VERIFY_OBJECT", "DRS_EXT_WHISTLER_BETA3"), - ("DRSUAPI_SUPPORTED_EXTENSION_XPRESS_COMPRESS", "DRS_EXT_W2K3_DEFLATE"), - ("DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V10", "DRS_EXT_GETCHGREQ_V10"), - ("DRSUAPI_SUPPORTED_EXTENSION_RESERVED_PART2", "DRS_EXT_RESERVED_FOR_WIN2K_OR_DOTNET_PART2"), + ("DRSUAPI_SUPPORTED_EXTENSION_CRYPTO_BIND", "DRS_EXT_CRYPTO_BIND"), + ("DRSUAPI_SUPPORTED_EXTENSION_GET_REPL_INFO", "DRS_EXT_GET_REPL_INFO"), + ("DRSUAPI_SUPPORTED_EXTENSION_STRONG_ENCRYPTION", "DRS_EXT_STRONG_ENCRYPTION"), + ("DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V01", "DRS_EXT_DCINFO_VFFFFFFFF"), + ("DRSUAPI_SUPPORTED_EXTENSION_TRANSITIVE_MEMBERSHIP", "DRS_EXT_TRANSITIVE_MEMBERSHIP"), + ("DRSUAPI_SUPPORTED_EXTENSION_ADD_SID_HISTORY", "DRS_EXT_ADD_SID_HISTORY"), + ("DRSUAPI_SUPPORTED_EXTENSION_POST_BETA3", "DRS_EXT_POST_BETA3"), + ("DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V5", "DRS_EXT_GETCHGREQ_V5"), + ("DRSUAPI_SUPPORTED_EXTENSION_GET_MEMBERSHIPS2", "DRS_EXT_GETMEMBERSHIPS2"), + ("DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V6", "DRS_EXT_GETCHGREQ_V6"), + ("DRSUAPI_SUPPORTED_EXTENSION_NONDOMAIN_NCS", "DRS_EXT_NONDOMAIN_NCS"), + ("DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V8", "DRS_EXT_GETCHGREQ_V8"), + ("DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V5", "DRS_EXT_GETCHGREPLY_V5"), + ("DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V6", "DRS_EXT_GETCHGREPLY_V6"), + ("DRSUAPI_SUPPORTED_EXTENSION_ADDENTRYREPLY_V3", "DRS_EXT_WHISTLER_BETA3"), + ("DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V7", "DRS_EXT_WHISTLER_BETA3"), + ("DRSUAPI_SUPPORTED_EXTENSION_VERIFY_OBJECT", "DRS_EXT_WHISTLER_BETA3"), + ("DRSUAPI_SUPPORTED_EXTENSION_XPRESS_COMPRESS", "DRS_EXT_W2K3_DEFLATE"), + ("DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V10", "DRS_EXT_GETCHGREQ_V10"), + ("DRSUAPI_SUPPORTED_EXTENSION_RESERVED_PART2", "DRS_EXT_RESERVED_FOR_WIN2K_OR_DOTNET_PART2"), ("DRSUAPI_SUPPORTED_EXTENSION_RESERVED_PART3", "DRS_EXT_RESERVED_FOR_WIN2K_OR_DOTNET_PART3") ] diff --git a/python/samba/netcmd/spn.py b/python/samba/netcmd/spn.py index b9069b0e408..0f97a74e3a8 100644 --- a/python/samba/netcmd/spn.py +++ b/python/samba/netcmd/spn.py @@ -89,7 +89,7 @@ class cmd_spn_add(Command): ] takes_args = ["name", "user"] - def run(self, name, user, force=False, credopts=None, sambaopts=None, + def run(self, name, user, force=False, credopts=None, sambaopts=None, versionopts=None): lp = sambaopts.get_loadparm() creds = credopts.get_credentials(lp) diff --git a/python/samba/netcmd/visualize.py b/python/samba/netcmd/visualize.py index 2ec2670df0b..2072d90e955 100644 --- a/python/samba/netcmd/visualize.py +++ b/python/samba/netcmd/visualize.py @@ -320,7 +320,7 @@ class cmd_reps(GraphCommand): if partition is None or part == partition: nc_reps[part]['needed'].append((dsa_dn, rep)) - all_edges = {'needed': {'to': [], 'from': []}, + all_edges = {'needed': {'to': [], 'from': []}, 'current': {'to': [], 'from': []}} short_partitions, long_partitions = get_partition_maps(local_kcc.samdb) diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index 5af894d4791..7012445b385 100644 --- a/python/samba/provision/__init__.py +++ b/python/samba/provision/__init__.py @@ -756,7 +756,7 @@ def make_smbconf(smbconf, hostname, domain, realm, targetdir, global_settings["binddns dir"] = os.path.abspath(os.path.join(targetdir, "bind-dns")) lp.set("lock dir", os.path.abspath(targetdir)) - lp.set("state directory", global_settings["state directory"]) + lp.set("state directory", global_settings["state directory"]) lp.set("cache directory", global_settings["cache directory"]) lp.set("binddns dir", global_settings["binddns dir"]) diff --git a/python/samba/tests/auth_log.py b/python/samba/tests/auth_log.py index b8e55528775..961401aa2e8 100644 --- a/python/samba/tests/auth_log.py +++ b/python/samba/tests/auth_log.py @@ -1278,7 +1278,7 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): self.assertEquals("Authorization", msg["type"]) self.assertEquals("DCE/RPC", msg["Authorization"]["serviceDescription"]) - self.assertEquals("schannel", msg["Authorization"]["authType"]) + self.assertEquals("schannel", msg["Authorization"]["authType"]) self.assertEquals("SEAL", msg["Authorization"]["transportProtection"]) self.assertTrue(self.is_guid(msg["Authorization"]["sessionId"])) @@ -1317,6 +1317,6 @@ class AuthLogTests(samba.tests.auth_log_base.AuthLogTestBase): self.assertEquals("Authorization", msg["type"]) self.assertEquals("DCE/RPC", msg["Authorization"]["serviceDescription"]) - self.assertEquals("schannel", msg["Authorization"]["authType"]) + self.assertEquals("schannel", msg["Authorization"]["authType"]) self.assertEquals("SEAL", msg["Authorization"]["transportProtection"]) self.assertTrue(self.is_guid(msg["Authorization"]["sessionId"])) diff --git a/python/samba/tests/dcerpc/dnsserver.py b/python/samba/tests/dcerpc/dnsserver.py index f09fad3040d..d0012c6174e 100644 --- a/python/samba/tests/dcerpc/dnsserver.py +++ b/python/samba/tests/dcerpc/dnsserver.py @@ -1000,7 +1000,7 @@ class DnsserverTests(RpcInterfaceTestCase): packed_part_sd)) try: msdns_dn = ldb.Dn(self.samdb, "CN=MicrosoftDNS,%s" % str(partition_dn)) - security_desc_dict = [(current_dn.get_linearized(), expected_sd), + security_desc_dict = [(current_dn.get_linearized(), expected_sd), (msdns_dn.get_linearized(), expected_msdns_sd), (partition_dn.get_linearized(), expected_part_sd)] @@ -1072,7 +1072,7 @@ class DnsserverTests(RpcInterfaceTestCase): packed_part_sd)) msdns_dn = ldb.Dn(self.samdb, "CN=MicrosoftDNS,%s" % str(partition_dn)) - security_desc_dict = [(current_dn.get_linearized(), expected_sd), + security_desc_dict = [(current_dn.get_linearized(), expected_sd), (msdns_dn.get_linearized(), expected_msdns_sd), (partition_dn.get_linearized(), expected_part_sd)] diff --git a/python/samba/tests/password_hash.py b/python/samba/tests/password_hash.py index bdb740d71ec..485d7b1a3e2 100644 --- a/python/samba/tests/password_hash.py +++ b/python/samba/tests/password_hash.py @@ -156,7 +156,7 @@ class PassWordHashTests(TestCase): return sc # Calculate and validate a Wdigest value - def check_digest(self, user, realm, password, digest): + def check_digest(self, user, realm, password, digest): expected = calc_digest(user, realm, password) actual = binascii.hexlify(bytearray(digest)) error = "Digest expected[%s], actual[%s], " \ diff --git a/python/samba/tests/samba_tool/dnscmd.py b/python/samba/tests/samba_tool/dnscmd.py index bc0e133c81c..9bbc65827c5 100644 --- a/python/samba/tests/samba_tool/dnscmd.py +++ b/python/samba/tests/samba_tool/dnscmd.py @@ -823,8 +823,8 @@ class DnsCmdTestCase(SambaToolCmdTest): """ num_failures = 0 failure_msgs = [] - records = [("*.", "MISS", "A", "1.1.1.1"), - ("*.SAMDOM", "MISS.SAMDOM", "A", "1.1.1.2")] + records = [("*.", "MISS", "A", "1.1.1.1"), + ("*.SAMDOM", "MISS.SAMDOM", "A", "1.1.1.2")] for (name, miss, dnstype, record) in records: try: result, out, err = self.runsubcmd("dns", "add", diff --git a/python/samba/tests/samba_tool/ntacl.py b/python/samba/tests/samba_tool/ntacl.py index 4078c271d98..91115cba01d 100644 --- a/python/samba/tests/samba_tool/ntacl.py +++ b/python/samba/tests/samba_tool/ntacl.py @@ -110,7 +110,7 @@ class NtACLCmdGetSetTestCase(SambaToolCmdTest): self.assertIn("Please note that POSIX permissions have NOT been changed, only the stored NT ACL", err) # Now check they were set correctly - (result, out, err) = self.runsubcmd("ntacl", "get", tempf, + (result, out, err) = self.runsubcmd("ntacl", "get", tempf, "--use-ntvfs", "--as-sddl") self.assertCmdSuccess(result, out, err) self.assertEquals(err, "", "Shouldn't be any error messages") @@ -128,7 +128,7 @@ class NtACLCmdGetSetTestCase(SambaToolCmdTest): self.assertEquals(err, "", "Shouldn't be any error messages") # Now check they were set correctly - (result, out, err) = self.runsubcmd("ntacl", "get", tempf, + (result, out, err) = self.runsubcmd("ntacl", "get", tempf, "--use-s3fs", "--as-sddl") self.assertCmdSuccess(result, out, err) self.assertEquals(err, "", "Shouldn't be any error messages") diff --git a/python/samba/tests/samba_tool/user_wdigest.py b/python/samba/tests/samba_tool/user_wdigest.py index 327fe5a4fde..22591ffe4a6 100644 --- a/python/samba/tests/samba_tool/user_wdigest.py +++ b/python/samba/tests/samba_tool/user_wdigest.py @@ -89,7 +89,7 @@ class UserCmdWdigestTestCase(SambaToolCmdTest): super(UserCmdWdigestTestCase, self).tearDown() self.runsubcmd("user", "delete", USER_NAME) - def _testWDigest(self, attribute, expected, missing=False): + def _testWDigest(self, attribute, expected, missing=False): (result, out, err) = self.runsubcmd("user", "getpassword", |