diff options
author | Joe Guo <joeg@catalyst.net.nz> | 2018-07-30 18:17:14 +1200 |
---|---|---|
committer | Douglas Bagnall <dbagnall@samba.org> | 2018-08-24 07:49:27 +0200 |
commit | ba0827b560c8165bcbb4017a6377778934ad9bb9 (patch) | |
tree | bf622e8cc16f566b052b3fb8be1fda6274dd0695 /source4 | |
parent | 562411bd9587bdd011bd70e25f9763c38a8af401 (diff) | |
download | samba-ba0827b560c8165bcbb4017a6377778934ad9bb9.tar.gz |
PEP8: fix E203: whitespace before ':'
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 'source4')
-rwxr-xr-x | source4/dsdb/tests/python/ldap.py | 8 | ||||
-rwxr-xr-x | source4/dsdb/tests/python/sec_descriptor.py | 196 | ||||
-rw-r--r-- | source4/lib/wmi/wmi.py | 2 | ||||
-rwxr-xr-x | source4/selftest/tests.py | 4 | ||||
-rw-r--r-- | source4/torture/drs/python/cracknames.py | 16 |
5 files changed, 113 insertions, 113 deletions
diff --git a/source4/dsdb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py index 8a15daee04f..e50eb5c03b1 100755 --- a/source4/dsdb/tests/python/ldap.py +++ b/source4/dsdb/tests/python/ldap.py @@ -660,7 +660,7 @@ class BasicTests(samba.tests.TestCase): "dn": "cn=ldaptestobject," + self.base_dn, "objectclass": "ipProtocol", "ipProtocolNumber": "1", - "uid" : "0"}) + "uid": "0"}) self.fail() except LdbError as e29: (num, _) = e29.args @@ -1667,8 +1667,8 @@ objectGUID: bd3480c9-58af-4cd8-92df-bc4a18b6e44d self.ldb.add({ "dn": "cn=ldaptestcontainer," + self.base_dn, "objectclass": "container", - "uSNCreated" : "1", - "uSNChanged" : "1", + "uSNCreated": "1", + "uSNChanged": "1", "whenCreated": timestring(long(time.time())), "whenChanged": timestring(long(time.time()))}) @@ -2224,7 +2224,7 @@ servicePrincipalName: host/ldaptest2computer29 self.assertEquals(len(res_user), 1, "Could not find (&(cn=ldaptestUSer2)(objectClass=user))") # Check rename works with extended/alternate DN forms - ldb.rename("<SID=" + ldb.schema_format_value("objectSID", res_user[0]["objectSID"][0]) + ">" , "cn=ldaptestUSER3,cn=users," + self.base_dn) + ldb.rename("<SID=" + ldb.schema_format_value("objectSID", res_user[0]["objectSID"][0]) + ">", "cn=ldaptestUSER3,cn=users," + self.base_dn) # Testing ldb.search for (&(cn=ldaptestuser3)(objectClass=user)) res = ldb.search(expression="(&(cn=ldaptestuser3)(objectClass=user))") diff --git a/source4/dsdb/tests/python/sec_descriptor.py b/source4/dsdb/tests/python/sec_descriptor.py index 1b7c84e2c07..926c422a7e7 100755 --- a/source4/dsdb/tests/python/sec_descriptor.py +++ b/source4/dsdb/tests/python/sec_descriptor.py @@ -220,106 +220,106 @@ class OwnerGroupDescriptorTests(DescriptorTests): self.results = { # msDS-Behavior-Version < DS_DOMAIN_FUNCTION_2008 - "ds_behavior_win2003" : { - "100" : "O:EAG:DU", - "101" : "O:DAG:DU", - "102" : "O:%sG:DU", - "103" : "O:%sG:DU", - "104" : "O:DAG:DU", - "105" : "O:DAG:DU", - "106" : "O:DAG:DU", - "107" : "O:EAG:DU", - "108" : "O:DAG:DA", - "109" : "O:DAG:DA", - "110" : "O:%sG:DA", - "111" : "O:%sG:DA", - "112" : "O:DAG:DA", - "113" : "O:DAG:DA", - "114" : "O:DAG:DA", - "115" : "O:DAG:DA", - "130" : "O:EAG:DU", - "131" : "O:DAG:DU", - "132" : "O:SAG:DU", - "133" : "O:%sG:DU", - "134" : "O:EAG:DU", - "135" : "O:SAG:DU", - "136" : "O:SAG:DU", - "137" : "O:SAG:DU", - "138" : "O:DAG:DA", - "139" : "O:DAG:DA", - "140" : "O:%sG:DA", - "141" : "O:%sG:DA", - "142" : "O:DAG:DA", - "143" : "O:DAG:DA", - "144" : "O:DAG:DA", - "145" : "O:DAG:DA", - "160" : "O:EAG:DU", - "161" : "O:DAG:DU", - "162" : "O:%sG:DU", - "163" : "O:%sG:DU", - "164" : "O:EAG:DU", - "165" : "O:EAG:DU", - "166" : "O:DAG:DU", - "167" : "O:EAG:DU", - "168" : "O:DAG:DA", - "169" : "O:DAG:DA", - "170" : "O:%sG:DA", - "171" : "O:%sG:DA", - "172" : "O:DAG:DA", - "173" : "O:DAG:DA", - "174" : "O:DAG:DA", - "175" : "O:DAG:DA", + "ds_behavior_win2003": { + "100": "O:EAG:DU", + "101": "O:DAG:DU", + "102": "O:%sG:DU", + "103": "O:%sG:DU", + "104": "O:DAG:DU", + "105": "O:DAG:DU", + "106": "O:DAG:DU", + "107": "O:EAG:DU", + "108": "O:DAG:DA", + "109": "O:DAG:DA", + "110": "O:%sG:DA", + "111": "O:%sG:DA", + "112": "O:DAG:DA", + "113": "O:DAG:DA", + "114": "O:DAG:DA", + "115": "O:DAG:DA", + "130": "O:EAG:DU", + "131": "O:DAG:DU", + "132": "O:SAG:DU", + "133": "O:%sG:DU", + "134": "O:EAG:DU", + "135": "O:SAG:DU", + "136": "O:SAG:DU", + "137": "O:SAG:DU", + "138": "O:DAG:DA", + "139": "O:DAG:DA", + "140": "O:%sG:DA", + "141": "O:%sG:DA", + "142": "O:DAG:DA", + "143": "O:DAG:DA", + "144": "O:DAG:DA", + "145": "O:DAG:DA", + "160": "O:EAG:DU", + "161": "O:DAG:DU", + "162": "O:%sG:DU", + "163": "O:%sG:DU", + "164": "O:EAG:DU", + "165": "O:EAG:DU", + "166": "O:DAG:DU", + "167": "O:EAG:DU", + "168": "O:DAG:DA", + "169": "O:DAG:DA", + "170": "O:%sG:DA", + "171": "O:%sG:DA", + "172": "O:DAG:DA", + "173": "O:DAG:DA", + "174": "O:DAG:DA", + "175": "O:DAG:DA", }, # msDS-Behavior-Version >= DS_DOMAIN_FUNCTION_2008 - "ds_behavior_win2008" : { - "100" : "O:EAG:EA", - "101" : "O:DAG:DA", - "102" : "O:%sG:DU", - "103" : "O:%sG:DU", - "104" : "O:DAG:DA", - "105" : "O:DAG:DA", - "106" : "O:DAG:DA", - "107" : "O:EAG:EA", - "108" : "O:DAG:DA", - "109" : "O:DAG:DA", - "110" : "O:%sG:DA", - "111" : "O:%sG:DA", - "112" : "O:DAG:DA", - "113" : "O:DAG:DA", - "114" : "O:DAG:DA", - "115" : "O:DAG:DA", - "130" : "O:EAG:EA", - "131" : "O:DAG:DA", - "132" : "O:SAG:SA", - "133" : "O:%sG:DU", - "134" : "O:EAG:EA", - "135" : "O:SAG:SA", - "136" : "O:SAG:SA", - "137" : "O:SAG:SA", - "138" : "", - "139" : "", - "140" : "O:%sG:DA", - "141" : "O:%sG:DA", - "142" : "", - "143" : "", - "144" : "", - "145" : "", - "160" : "O:EAG:EA", - "161" : "O:DAG:DA", - "162" : "O:%sG:DU", - "163" : "O:%sG:DU", - "164" : "O:EAG:EA", - "165" : "O:EAG:EA", - "166" : "O:DAG:DA", - "167" : "O:EAG:EA", - "168" : "O:DAG:DA", - "169" : "O:DAG:DA", - "170" : "O:%sG:DA", - "171" : "O:%sG:DA", - "172" : "O:DAG:DA", - "173" : "O:DAG:DA", - "174" : "O:DAG:DA", - "175" : "O:DAG:DA", + "ds_behavior_win2008": { + "100": "O:EAG:EA", + "101": "O:DAG:DA", + "102": "O:%sG:DU", + "103": "O:%sG:DU", + "104": "O:DAG:DA", + "105": "O:DAG:DA", + "106": "O:DAG:DA", + "107": "O:EAG:EA", + "108": "O:DAG:DA", + "109": "O:DAG:DA", + "110": "O:%sG:DA", + "111": "O:%sG:DA", + "112": "O:DAG:DA", + "113": "O:DAG:DA", + "114": "O:DAG:DA", + "115": "O:DAG:DA", + "130": "O:EAG:EA", + "131": "O:DAG:DA", + "132": "O:SAG:SA", + "133": "O:%sG:DU", + "134": "O:EAG:EA", + "135": "O:SAG:SA", + "136": "O:SAG:SA", + "137": "O:SAG:SA", + "138": "", + "139": "", + "140": "O:%sG:DA", + "141": "O:%sG:DA", + "142": "", + "143": "", + "144": "", + "145": "", + "160": "O:EAG:EA", + "161": "O:DAG:DA", + "162": "O:%sG:DU", + "163": "O:%sG:DU", + "164": "O:EAG:EA", + "165": "O:EAG:EA", + "166": "O:DAG:DA", + "167": "O:EAG:EA", + "168": "O:DAG:DA", + "169": "O:DAG:DA", + "170": "O:%sG:DA", + "171": "O:%sG:DA", + "172": "O:DAG:DA", + "173": "O:DAG:DA", + "174": "O:DAG:DA", + "175": "O:DAG:DA", }, } # Discover 'domainControllerFunctionality' diff --git a/source4/lib/wmi/wmi.py b/source4/lib/wmi/wmi.py index ff7170eb586..c552c06ad57 100644 --- a/source4/lib/wmi/wmi.py +++ b/source4/lib/wmi/wmi.py @@ -42,7 +42,7 @@ try: _object = types.ObjectType _newclass = 1 except AttributeError: - class _object : pass + class _object: pass _newclass = 0 del types diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 08116d5d3ef..4efcf77e590 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -1120,11 +1120,11 @@ for env in ['vampire_dc', 'promoted_dc', 'rodc']: for env in ["ad_dc_ntvfs", "ad_dc", "fl2000dc", "fl2003dc", "fl2008r2dc", 'vampire_dc', 'promoted_dc', 'backupfromdc', 'restoredc', 'renamedc', 'offlinebackupdc', 'labdc']: - plantestsuite("samba4.blackbox.dbcheck(%s)" % env, env + ":local" , ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck.sh"), '$PREFIX/provision', configuration]) + plantestsuite("samba4.blackbox.dbcheck(%s)" % env, env + ":local", ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck.sh"), '$PREFIX/provision', configuration]) # cmocka tests not requiring a specific environment # -plantestsuite("samba4.dsdb.samdb.ldb_modules.unique_object_sids" , "none", +plantestsuite("samba4.dsdb.samdb.ldb_modules.unique_object_sids", "none", [os.path.join(bindir(), "test_unique_object_sids")]) plantestsuite("samba4.dsdb.samdb.ldb_modules.encrypted_secrets", "none", [os.path.join(bindir(), "test_encrypted_secrets")]) diff --git a/source4/torture/drs/python/cracknames.py b/source4/torture/drs/python/cracknames.py index 9bf90f9c997..092f2046654 100644 --- a/source4/torture/drs/python/cracknames.py +++ b/source4/torture/drs/python/cracknames.py @@ -39,10 +39,10 @@ class DrsCracknamesTestCase(drs_base.DrsBaseTestCase): self.user_record = { "dn": self.user, "objectclass": "user", - "sAMAccountName" : self.username, - "userPrincipalName" : "test@test.com", - "servicePrincipalName" : "test/%s" % self.ldb_dc1.get_default_basedn(), - "displayName" : "test"} + "sAMAccountName": self.username, + "userPrincipalName": "test@test.com", + "servicePrincipalName": "test/%s" % self.ldb_dc1.get_default_basedn(), + "displayName": "test"} self.ldb_dc1.add(self.user_record) self.ldb_dc1.delete(self.user_record["dn"]) @@ -121,11 +121,11 @@ class DrsCracknamesTestCase(drs_base.DrsBaseTestCase): user_record = { "dn": user, "objectclass": "user", - "sAMAccountName" : username, - "userPrincipalName" : "test2@test.com", - "servicePrincipalName" : ["test2/%s" % self.ldb_dc1.get_default_basedn(), + "sAMAccountName": username, + "userPrincipalName": "test2@test.com", + "servicePrincipalName": ["test2/%s" % self.ldb_dc1.get_default_basedn(), "test3/%s" % self.ldb_dc1.get_default_basedn()], - "displayName" : "test2"} + "displayName": "test2"} self.ldb_dc1.add(user_record) |