diff options
34 files changed, 68 insertions, 68 deletions
diff --git a/examples/scripts/vfs/media_harmony/trigger_avid_update.py b/examples/scripts/vfs/media_harmony/trigger_avid_update.py index 938b3d11053..ca7e7d89095 100755 --- a/examples/scripts/vfs/media_harmony/trigger_avid_update.py +++ b/examples/scripts/vfs/media_harmony/trigger_avid_update.py @@ -85,7 +85,7 @@ if __name__ == "__main__": newer_file = True if newer_file: - utime = None # Sets to current time. + utime = None # Sets to current time. print '...Setting fake mtime to NOW. Will trigger re-index.' else: mtime = os.stat(media_dir)[stat.ST_MTIME] diff --git a/python/samba/gpclass.py b/python/samba/gpclass.py index eb622b1c967..0cadcd45fc7 100644 --- a/python/samba/gpclass.py +++ b/python/samba/gpclass.py @@ -507,7 +507,7 @@ def unapply_gp(lp, creds, test_ldb, logger, store, gp_extensions): unapply_attributes = gp_db.list(gp_extensions) for attr in unapply_attributes: attr_obj = attr[-1](logger, test_ldb, gp_db, lp, attr[0], attr[1]) - attr_obj.mapper()[attr[0]][0](attr[1]) # Set the old value + attr_obj.mapper()[attr[0]][0](attr[1]) # Set the old value gp_db.delete(str(attr_obj), attr[0]) gp_db.commit() diff --git a/python/samba/ms_schema.py b/python/samba/ms_schema.py index 21e91d311ab..850bdca3ae5 100644 --- a/python/samba/ms_schema.py +++ b/python/samba/ms_schema.py @@ -36,14 +36,14 @@ bitFields["searchflags"] = { 'fTUPLEINDEX': 26, # TP 'fSUBTREEATTINDEX': 25, # ST 'fCONFIDENTIAL': 24, # CF - 'fCONFIDENTAIL': 24, # typo + 'fCONFIDENTAIL': 24, # typo 'fNEVERVALUEAUDIT': 23, # NV 'fRODCAttribute': 22, # RO # missing in ADTS but required by LDIF 'fRODCFilteredAttribute': 22, # RO - 'fRODCFILTEREDATTRIBUTE': 22, # case + 'fRODCFILTEREDATTRIBUTE': 22, # case 'fEXTENDEDLINKTRACKING': 21, # XL 'fBASEONLY': 20, # BO 'fPARTITIONSECRET': 19, # SE diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index 40117251450..889aa922eac 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -1057,7 +1057,7 @@ class cmd_domain_level(Command): takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), - Option("-q", "--quiet", help="Be quiet", action="store_true"), # unused + Option("-q", "--quiet", help="Be quiet", action="store_true"), # unused Option("--forest-level", type="choice", choices=["2003", "2008", "2008_R2", "2012", "2012_R2"], 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"], @@ -1364,7 +1364,7 @@ class cmd_domain_passwordsettings_set(Command): takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), - Option("-q", "--quiet", help="Be quiet", action="store_true"), # unused + Option("-q", "--quiet", help="Be quiet", action="store_true"), # unused Option("--complexity", type="choice", choices=["on", "off", "default"], help="The password complexity (on | off | default). Default is 'on'"), Option("--store-plaintext", type="choice", choices=["on", "off", "default"], @@ -4028,7 +4028,7 @@ class cmd_domain_schema_upgrade(Command): takes_options = [ Option("-H", "--URL", help="LDB URL for database or target server", type=str, metavar="URL", dest="H"), - Option("-q", "--quiet", help="Be quiet", action="store_true"), #unused + Option("-q", "--quiet", help="Be quiet", action="store_true"), # unused Option("-v", "--verbose", help="Be verbose", action="store_true"), Option("--schema", type="choice", metavar="SCHEMA", choices=["2012", "2012_R2"], diff --git a/python/samba/netcmd/ldapcmp.py b/python/samba/netcmd/ldapcmp.py index 3f4d63d989f..3b0e0d536cf 100644 --- a/python/samba/netcmd/ldapcmp.py +++ b/python/samba/netcmd/ldapcmp.py @@ -439,7 +439,7 @@ class LDAPObject(object): "uSNChanged", "uSNCreated", "uSNLastObjRem", - "whenChanged", # This is implicitly replicated, but may diverge on updates of non-replicated attributes + "whenChanged", # This is implicitly replicated, but may diverge on updates of non-replicated attributes ] self.ignore_attributes = self.non_replicated_attributes self.ignore_attributes += ["msExchServer1HighestUSN"] @@ -677,7 +677,7 @@ class LDAPObject(object): self.summary["unique_attrs"] += self.unique_attrs self.summary["df_value_attrs"] += self.df_value_attrs other.summary["unique_attrs"] += other.unique_attrs - other.summary["df_value_attrs"] += self.df_value_attrs # they are the same + other.summary["df_value_attrs"] += self.df_value_attrs # they are the same # self.screen_output = res[:-1] other.screen_output = res[:-1] diff --git a/python/samba/netcmd/user.py b/python/samba/netcmd/user.py index 677e0a91559..ab00a07b8f6 100644 --- a/python/samba/netcmd/user.py +++ b/python/samba/netcmd/user.py @@ -2202,7 +2202,7 @@ samba-tool user syncpasswords --terminate \\ if pid == 0: os.setsid() pid = os.fork() - if pid == 0: # Actual daemon + if pid == 0: # Actual daemon pid = os.getpid() log_msg("Daemonized as pid %d (from %d)\n" % (pid, orig_pid)) load_cache() @@ -2220,7 +2220,7 @@ samba-tool user syncpasswords --terminate \\ import resource # Resource usage information. maxfd = resource.getrlimit(resource.RLIMIT_NOFILE)[1] if maxfd == resource.RLIM_INFINITY: - maxfd = 1024 # Rough guess at maximum number of open file descriptors. + maxfd = 1024 # Rough guess at maximum number of open file descriptors. logfd = os.open(logfile, os.O_WRONLY | os.O_APPEND | os.O_CREAT, 0o600) self.outf.write("Using logfile[%s]\n" % logfile) for fd in range(0, maxfd): diff --git a/python/samba/samba3/__init__.py b/python/samba/samba3/__init__.py index 950b3c28479..283185aa823 100644 --- a/python/samba/samba3/__init__.py +++ b/python/samba/samba3/__init__.py @@ -324,7 +324,7 @@ class WinsDatabase(object): f = open(file, 'r') assert f.readline().rstrip("\n") == "VERSION 1 0" for l in f.readlines(): - if l[0] == "#": # skip comments + if l[0] == "#": # skip comments continue entries = shellsplit(l.rstrip("\n")) name = entries[0] @@ -352,7 +352,7 @@ class WinsDatabase(object): """Return the entries in this WINS database.""" return self.entries.items() - def close(self): # for consistency + def close(self): # for consistency pass diff --git a/python/samba/tests/dcerpc/dnsserver.py b/python/samba/tests/dcerpc/dnsserver.py index c45d81e69fb..e0fff73ad78 100644 --- a/python/samba/tests/dcerpc/dnsserver.py +++ b/python/samba/tests/dcerpc/dnsserver.py @@ -172,7 +172,7 @@ class DnsserverTests(RpcInterfaceTestCase): self.add_record(self.custom_zone, "testrecord", record_type_str, record_str) dn, record = self.get_record_from_db(self.custom_zone, "testrecord") - record.rank = 0 # DNS_RANK_NONE + record.rank = 0 # DNS_RANK_NONE res = self.samdb.dns_replace_by_dn(dn, [record]) if res is not None: self.fail("Unable to update dns record to have DNS_RANK_NONE.") diff --git a/python/samba/tests/dcerpc/registry.py b/python/samba/tests/dcerpc/registry.py index 95de0d0703f..279eeb1cc82 100644 --- a/python/samba/tests/dcerpc/registry.py +++ b/python/samba/tests/dcerpc/registry.py @@ -47,5 +47,5 @@ class WinregTests(RpcInterfaceTestCase): handle = self.conn.OpenHKLM(None, winreg.KEY_QUERY_VALUE | winreg.KEY_ENUMERATE_SUB_KEYS) x = self.conn.QueryInfoKey(handle, winreg.String()) - self.assertEquals(9, len(x)) # should return a 9-tuple + self.assertEquals(9, len(x)) # should return a 9-tuple self.conn.CloseKey(handle) diff --git a/python/samba/tests/dcerpc/srvsvc.py b/python/samba/tests/dcerpc/srvsvc.py index a3e60757483..4590ca5a412 100644 --- a/python/samba/tests/dcerpc/srvsvc.py +++ b/python/samba/tests/dcerpc/srvsvc.py @@ -40,7 +40,7 @@ class SrvsvcTests(RpcInterfaceTestCase): share.current_users = 0x00000000 share.max_users = -1 share.password = None - share.path = u'C:\\tmp' # some random path + share.path = u'C:\\tmp' # some random path share.permissions = 123434566 return share diff --git a/python/samba/tests/dcerpc/testrpc.py b/python/samba/tests/dcerpc/testrpc.py index 5aadcf48eed..f8191ba2dbe 100644 --- a/python/samba/tests/dcerpc/testrpc.py +++ b/python/samba/tests/dcerpc/testrpc.py @@ -109,7 +109,7 @@ class RpcTests(object): print("ERROR: Failed to check_type %s.%s: %r: %s" % (iname, n, e.__class__, e)) self.errcount += 1 elif callable(value): - pass # Method + pass # Method else: print("UNKNOWN: %s=%s" % (n, value)) if self.errcount - errcount != 0: diff --git a/python/samba/tests/kcc/__init__.py b/python/samba/tests/kcc/__init__.py index ee09a78689a..b2518022805 100644 --- a/python/samba/tests/kcc/__init__.py +++ b/python/samba/tests/kcc/__init__.py @@ -35,7 +35,7 @@ from samba.credentials import Credentials from samba.samdb import SamDB unix_now = int(time.time()) -unix_once_upon_a_time = 1000000000 #2001-09-09 +unix_once_upon_a_time = 1000000000 # 2001-09-09 ENV_DSAS = { 'ad_dc_ntvfs': ['CN=LOCALDC,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,DC=samba,DC=example,DC=com'], diff --git a/python/samba/tests/pam_winbind.py b/python/samba/tests/pam_winbind.py index d64600e8566..0f38469da0b 100644 --- a/python/samba/tests/pam_winbind.py +++ b/python/samba/tests/pam_winbind.py @@ -26,7 +26,7 @@ class SimplePamTests(samba.tests.TestCase): username = os.environ["USERNAME"] password = os.environ["PASSWORD"] unix_username = "%s/%s" % (domain, username) - expected_rc = 0 # PAM_SUCCESS + expected_rc = 0 # PAM_SUCCESS tc = pypamtest.TestCase(pypamtest.PAMTEST_AUTHENTICATE, expected_rc) res = pypamtest.run_pamtest(unix_username, "samba", [tc], [password]) @@ -38,7 +38,7 @@ class SimplePamTests(samba.tests.TestCase): username = os.environ["USERNAME"] password = "WrongPassword" unix_username = "%s/%s" % (domain, username) - expected_rc = 7 # PAM_AUTH_ERR + expected_rc = 7 # PAM_AUTH_ERR tc = pypamtest.TestCase(pypamtest.PAMTEST_AUTHENTICATE, expected_rc) res = pypamtest.run_pamtest(unix_username, "samba", [tc], [password]) @@ -48,7 +48,7 @@ class SimplePamTests(samba.tests.TestCase): # Authenticate again to check that we are not locked out with just one # failed login password = os.environ["PASSWORD"] - expected_rc = 0 # PAM_SUCCESS + expected_rc = 0 # PAM_SUCCESS tc = pypamtest.TestCase(pypamtest.PAMTEST_AUTHENTICATE, expected_rc) res = pypamtest.run_pamtest(unix_username, "samba", [tc], [password]) diff --git a/python/samba/tests/pam_winbind_warn_pwd_expire.py b/python/samba/tests/pam_winbind_warn_pwd_expire.py index c573657c4dd..c3b7e1dbfca 100644 --- a/python/samba/tests/pam_winbind_warn_pwd_expire.py +++ b/python/samba/tests/pam_winbind_warn_pwd_expire.py @@ -27,7 +27,7 @@ class PasswordExpirePamTests(samba.tests.TestCase): password = os.environ["PASSWORD"] warn_pwd_expire = int(os.environ["WARN_PWD_EXPIRE"]) unix_username = "%s/%s" % (domain, username) - expected_rc = 0 # PAM_SUCCESS + expected_rc = 0 # PAM_SUCCESS tc = pypamtest.TestCase(pypamtest.PAMTEST_AUTHENTICATE, expected_rc) res = pypamtest.run_pamtest(unix_username, "samba", [tc], [password]) diff --git a/python/samba/tests/samba_tool/dnscmd.py b/python/samba/tests/samba_tool/dnscmd.py index 9bbc65827c5..ccd7e8f2c1e 100644 --- a/python/samba/tests/samba_tool/dnscmd.py +++ b/python/samba/tests/samba_tool/dnscmd.py @@ -171,7 +171,7 @@ class DnsCmdTestCase(SambaToolCmdTest): % (record_str, record_type_str)) dn, record = self.get_record_from_db(self.zone, "testrecord") - record.rank = 0 # DNS_RANK_NONE + record.rank = 0 # DNS_RANK_NONE res = self.samdb.dns_replace_by_dn(dn, [record]) if res is not None: self.fail("Unable to update dns record to have DNS_RANK_NONE.") @@ -386,7 +386,7 @@ class DnsCmdTestCase(SambaToolCmdTest): try: self.assertCmdFail(result) except AssertionError: - continue # Don't check this one, because record2 _is_ a valid entry of dnstype1. + continue # Don't check this one, because record2 _is_ a valid entry of dnstype1. # Check both ways: Give the current type and try to update, # and give the new type and try to update. @@ -484,7 +484,7 @@ class DnsCmdTestCase(SambaToolCmdTest): # we can't enter the wrong current value for a given record. for dnstype in self.good_records: if len(self.good_records[dnstype]) < 3: - continue # Not enough records of this type to do this test + continue # Not enough records of this type to do this test used_record = self.good_records[dnstype][0] unused_record = self.good_records[dnstype][1] diff --git a/python/samba/tests/samba_tool/sites.py b/python/samba/tests/samba_tool/sites.py index 228f28d9272..89197f7764a 100644 --- a/python/samba/tests/samba_tool/sites.py +++ b/python/samba/tests/samba_tool/sites.py @@ -77,9 +77,9 @@ class SitesSubnetCmdTestCase(BaseSitesCmdTestCase): def test_site_subnet_create(self): cidrs = (("10.9.8.0/24", self.sitename), ("50.60.0.0/16", self.sitename2), - ("50.61.0.0/16", self.sitename2), # second subnet on the site - ("50.0.0.0/8", self.sitename), # overlapping subnet, other site - ("50.62.1.2/32", self.sitename), # single IP + ("50.61.0.0/16", self.sitename2), # second subnet on the site + ("50.0.0.0/8", self.sitename), # overlapping subnet, other site + ("50.62.1.2/32", self.sitename), # single IP ("aaaa:bbbb:cccc:dddd:eeee:ffff:2222:1100/120", self.sitename2), ) @@ -114,7 +114,7 @@ class SitesSubnetCmdTestCase(BaseSitesCmdTestCase): def test_site_subnet_create_should_fail(self): cidrs = (("10.9.8.0/33", self.sitename), # mask too big ("50.60.0.0/8", self.sitename2), # insufficient zeros - ("50.261.0.0/16", self.sitename2), # bad octet + ("50.261.0.0/16", self.sitename2), # bad octet ("7.0.0.0.0/0", self.sitename), # insufficient zeros ("aaaa:bbbb:cccc:dddd:eeee:ffff:2222:1100/119", self.sitename), # insufficient zeros diff --git a/python/samba/upgrade.py b/python/samba/upgrade.py index c340575b2c2..2e17f186a95 100644 --- a/python/samba/upgrade.py +++ b/python/samba/upgrade.py @@ -351,9 +351,9 @@ def import_wins(samba4_winsdb, samba3_winsdb): rType = 0x0 if ttl > time.time(): - rState = 0x0 # active + rState = 0x0 # active else: - rState = 0x1 # released + rState = 0x1 # released nType = ((nb_flags & 0x60) >> 5) diff --git a/script/autobuild.py b/script/autobuild.py index 9a1e54060a2..d3b46e69f26 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -607,18 +607,18 @@ def find_git_root(): def daemonize(logfile): pid = os.fork() - if pid == 0: # Parent + if pid == 0: # Parent os.setsid() pid = os.fork() - if pid != 0: # Actual daemon + if pid != 0: # Actual daemon os._exit(0) - else: # Grandparent + else: # Grandparent os._exit(0) import resource # Resource usage information. maxfd = resource.getrlimit(resource.RLIMIT_NOFILE)[1] if maxfd == resource.RLIM_INFINITY: - maxfd = 1024 # Rough guess at maximum number of open file descriptors. + maxfd = 1024 # Rough guess at maximum number of open file descriptors. for fd in range(0, maxfd): try: os.close(fd) diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py index 2955d80011c..3ac2d963a90 100644 --- a/selftest/subunithelper.py +++ b/selftest/subunithelper.py @@ -280,7 +280,7 @@ class ImmediateFail(Exception): class FilterOps(unittest.TestResult): def control_msg(self, msg): - pass # We regenerate control messages, so ignore this + pass # We regenerate control messages, so ignore this def time(self, time): self._ops.time(time) diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py index 30be1c77520..bea78a341e0 100755 --- a/source4/dsdb/tests/python/acl.py +++ b/source4/dsdb/tests/python/acl.py @@ -98,7 +98,7 @@ class AclTests(samba.tests.TestCase): creds_tmp.set_workstation(creds.get_workstation()) creds_tmp.set_gensec_features(creds_tmp.get_gensec_features() | gensec.FEATURE_SEAL) - creds_tmp.set_kerberos_state(DONT_USE_KERBEROS) # kinit is too expensive to use in a tight loop + creds_tmp.set_kerberos_state(DONT_USE_KERBEROS) # kinit is too expensive to use in a tight loop ldb_target = SamDB(url=ldaphost, credentials=creds_tmp, lp=lp) return ldb_target diff --git a/source4/dsdb/tests/python/ad_dc_medley_performance.py b/source4/dsdb/tests/python/ad_dc_medley_performance.py index 9ea1b6aac7c..f2a8fea60b5 100644 --- a/source4/dsdb/tests/python/ad_dc_medley_performance.py +++ b/source4/dsdb/tests/python/ad_dc_medley_performance.py @@ -254,7 +254,7 @@ class UserTests(samba.tests.TestCase): def _test_complex_search(self, n=100): classes = ['samaccountname', 'objectCategory', 'dn', 'member'] values = ['*', '*t*', 'g*', 'user'] - comparators = ['=', '<=', '>='] # '~=' causes error + comparators = ['=', '<=', '>='] # '~=' causes error maybe_not = ['!(', ''] joiners = ['&', '|'] diff --git a/source4/dsdb/tests/python/ad_dc_search_performance.py b/source4/dsdb/tests/python/ad_dc_search_performance.py index 7911f20564e..e2469461644 100644 --- a/source4/dsdb/tests/python/ad_dc_search_performance.py +++ b/source4/dsdb/tests/python/ad_dc_search_performance.py @@ -177,7 +177,7 @@ class UserTests(samba.tests.TestCase): def _test_complex_search(self): classes = ['samaccountname', 'objectCategory', 'dn', 'member'] values = ['*', '*t*', 'g*', 'user'] - comparators = ['=', '<=', '>='] # '~=' causes error + comparators = ['=', '<=', '>='] # '~=' causes error maybe_not = ['!(', ''] joiners = ['&', '|'] diff --git a/source4/dsdb/tests/python/dirsync.py b/source4/dsdb/tests/python/dirsync.py index 71ea23f05e8..97332760122 100755 --- a/source4/dsdb/tests/python/dirsync.py +++ b/source4/dsdb/tests/python/dirsync.py @@ -98,7 +98,7 @@ class DirsyncBaseTests(samba.tests.TestCase): creds_tmp.set_workstation(creds.get_workstation()) creds_tmp.set_gensec_features(creds_tmp.get_gensec_features() | gensec.FEATURE_SEAL) - creds_tmp.set_kerberos_state(DONT_USE_KERBEROS) # kinit is too expensive to use in a tight loop + creds_tmp.set_kerberos_state(DONT_USE_KERBEROS) # kinit is too expensive to use in a tight loop ldb_target = SamDB(url=ldaphost, credentials=creds_tmp, lp=lp) return ldb_target diff --git a/source4/dsdb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py index 6e4d3e3e39b..95c721e7499 100755 --- a/source4/dsdb/tests/python/ldap.py +++ b/source4/dsdb/tests/python/ldap.py @@ -1679,9 +1679,9 @@ objectGUID: bd3480c9-58af-4cd8-92df-bc4a18b6e44d self.assertFalse("description" in res[0]) self.assertTrue("objectGUID" in res[0]) self.assertTrue("uSNCreated" in res[0]) - self.assertFalse(res[0]["uSNCreated"][0] == "1") # these are corrected + self.assertFalse(res[0]["uSNCreated"][0] == "1") # these are corrected self.assertTrue("uSNChanged" in res[0]) - self.assertFalse(res[0]["uSNChanged"][0] == "1") # these are corrected + self.assertFalse(res[0]["uSNChanged"][0] == "1") # these are corrected self.assertTrue("whenCreated" in res[0]) self.assertTrue("whenChanged" in res[0]) diff --git a/source4/dsdb/tests/python/passwords.py b/source4/dsdb/tests/python/passwords.py index c7e94b2625b..2ab1b77ea19 100755 --- a/source4/dsdb/tests/python/passwords.py +++ b/source4/dsdb/tests/python/passwords.py @@ -746,7 +746,7 @@ userPassword: thatsAcomplPASS4 except LdbError as e35: (num, _) = e35.args self.assertTrue(num == ERR_CONSTRAINT_VIOLATION or - num == ERR_NO_SUCH_ATTRIBUTE) # for Windows + num == ERR_NO_SUCH_ATTRIBUTE) # for Windows delete_force(self.ldb, "cn=testuser2,cn=users," + self.base_dn) @@ -789,7 +789,7 @@ userPassword: thatsAcomplPASS4 except LdbError as e39: (num, _) = e39.args self.assertTrue(num == ERR_CONSTRAINT_VIOLATION or - num == ERR_NO_SUCH_ATTRIBUTE) # for Windows + num == ERR_NO_SUCH_ATTRIBUTE) # for Windows m = Message() m.dn = Dn(self.ldb, "cn=testuser,cn=users," + self.base_dn) @@ -830,7 +830,7 @@ userPassword: thatsAcomplPASS4 except LdbError as e43: (num, _) = e43.args self.assertTrue(num == ERR_UNWILLING_TO_PERFORM or - num == ERR_NO_SUCH_ATTRIBUTE) # for Windows + num == ERR_NO_SUCH_ATTRIBUTE) # for Windows m = Message() m.dn = Dn(self.ldb, "cn=testuser,cn=users," + self.base_dn) @@ -871,7 +871,7 @@ userPassword: thatsAcomplPASS4 except LdbError as e47: (num, _) = e47.args self.assertTrue(num == ERR_CONSTRAINT_VIOLATION or - num == ERR_NO_SUCH_ATTRIBUTE) # for Windows + num == ERR_NO_SUCH_ATTRIBUTE) # for Windows def test_plain_userPassword(self): print("Performs testing about the standard 'userPassword' behaviour") @@ -879,7 +879,7 @@ userPassword: thatsAcomplPASS4 # Delete the "dSHeuristics" self.ldb.set_dsheuristics(None) - time.sleep(1) # This switching time is strictly needed! + time.sleep(1) # This switching time is strictly needed! m = Message() m.dn = Dn(self.ldb, "cn=testuser,cn=users," + self.base_dn) @@ -1105,7 +1105,7 @@ clearTextPassword: thatsAcomplPASS2 """) except LdbError, (num, msg): self.assertTrue(num == ERR_CONSTRAINT_VIOLATION or - num == ERR_NO_SUCH_ATTRIBUTE) # for Windows + num == ERR_NO_SUCH_ATTRIBUTE) # for Windows else: self.fail() diff --git a/source4/dsdb/tests/python/rodc_rwdc.py b/source4/dsdb/tests/python/rodc_rwdc.py index 7d8d25a0d8c..0126f03195b 100644 --- a/source4/dsdb/tests/python/rodc_rwdc.py +++ b/source4/dsdb/tests/python/rodc_rwdc.py @@ -187,7 +187,7 @@ class RodcRwdcCachedTests(password_lockout_base.BasePasswordTestCase): set_auto_replication(RWDC, True) def setUp(self): - self.kerberos = False # To be set later + self.kerberos = False # To be set later self.rodc_db = SamDB('ldap://%s' % RODC, credentials=CREDS, session_info=system_session(LP), lp=LP) diff --git a/source4/dsdb/tests/python/sec_descriptor.py b/source4/dsdb/tests/python/sec_descriptor.py index 7b9f6083f82..858f9337e18 100755 --- a/source4/dsdb/tests/python/sec_descriptor.py +++ b/source4/dsdb/tests/python/sec_descriptor.py @@ -139,7 +139,7 @@ showInAdvancedViewOnly: TRUE creds_tmp.set_workstation(creds.get_workstation()) creds_tmp.set_gensec_features(creds_tmp.get_gensec_features() | gensec.FEATURE_SEAL) - creds_tmp.set_kerberos_state(DONT_USE_KERBEROS) # kinit is too expensive to use in a tight loop + creds_tmp.set_kerberos_state(DONT_USE_KERBEROS) # kinit is too expensive to use in a tight loop ldb_target = SamDB(url=host, credentials=creds_tmp, lp=lp) return ldb_target @@ -355,7 +355,7 @@ class OwnerGroupDescriptorTests(DescriptorTests): def check_modify_inheritance(self, _ldb, object_dn, owner_group=""): # Modify sd_user_utils = sd_utils.SDUtils(_ldb) - ace = "(D;;CC;;;LG)" # Deny Create Children to Guest account + ace = "(D;;CC;;;LG)" # Deny Create Children to Guest account if owner_group != "": sd_user_utils.modify_sd_on_dn(object_dn, owner_group + "D:" + ace) else: @@ -1366,7 +1366,7 @@ class DaclDescriptorTests(DescriptorTests): # Make sure created group object contains only the above inherited ACE # that we've added manually desc_sddl = self.sd_utils.get_sd_as_sddl(group_dn) - mod = mod.replace(";OI;", ";OIIOID;") # change it how it's gonna look like + mod = mod.replace(";OI;", ";OIIOID;") # change it how it's gonna look like self.assertTrue(mod in desc_sddl) self.sd_utils.modify_sd_on_dn(group_dn, "D:" + moded) desc_sddl = self.sd_utils.get_sd_as_sddl(group_dn) @@ -1392,7 +1392,7 @@ class DaclDescriptorTests(DescriptorTests): # Make sure created group object contains only the above inherited ACE # that we've added manually desc_sddl = self.sd_utils.get_sd_as_sddl(group_dn) - mod = mod.replace(";CI;", ";CIID;") # change it how it's gonna look like + mod = mod.replace(";CI;", ";CIID;") # change it how it's gonna look like self.assertTrue(mod in desc_sddl) self.sd_utils.modify_sd_on_dn(group_dn, "D:" + moded) desc_sddl = self.sd_utils.get_sd_as_sddl(group_dn) @@ -1418,7 +1418,7 @@ class DaclDescriptorTests(DescriptorTests): # Make sure created group object contains only the above inherited ACE # that we've added manually desc_sddl = self.sd_utils.get_sd_as_sddl(group_dn) - mod = mod.replace(";OI;", ";OIIOID;") # change it how it's gonna look like + mod = mod.replace(";OI;", ";OIIOID;") # change it how it's gonna look like self.assertTrue(mod in desc_sddl) self.sd_utils.modify_sd_on_dn(group_dn, "D:" + moded) desc_sddl = self.sd_utils.get_sd_as_sddl(group_dn) @@ -1444,7 +1444,7 @@ class DaclDescriptorTests(DescriptorTests): # Make sure created group object contains only the above inherited ACE # that we've added manually desc_sddl = self.sd_utils.get_sd_as_sddl(group_dn) - mod = mod.replace(";CI;", ";CIID;") # change it how it's gonna look like + mod = mod.replace(";CI;", ";CIID;") # change it how it's gonna look like self.assertTrue(mod in desc_sddl) self.sd_utils.modify_sd_on_dn(group_dn, "D:" + moded) desc_sddl = self.sd_utils.get_sd_as_sddl(group_dn) @@ -1470,7 +1470,7 @@ class DaclDescriptorTests(DescriptorTests): # Make sure created group object contains only the above inherited ACE # that we've added manually desc_sddl = self.sd_utils.get_sd_as_sddl(group_dn) - mod = mod.replace(";OI;", ";OIIOID;") # change it how it's gonna look like + mod = mod.replace(";OI;", ";OIIOID;") # change it how it's gonna look like self.assertTrue(mod in desc_sddl) self.sd_utils.modify_sd_on_dn(group_dn, "D:(OA;OI;WP;bf967a39-0de6-11d0-a285-00aa003049e2;;DU)" + moded) desc_sddl = self.sd_utils.get_sd_as_sddl(group_dn) diff --git a/source4/dsdb/tests/python/sites.py b/source4/dsdb/tests/python/sites.py index f5ca6a3bc9f..17d3c960bdb 100755 --- a/source4/dsdb/tests/python/sites.py +++ b/source4/dsdb/tests/python/sites.py @@ -451,7 +451,7 @@ class SimpleSubnetTests(SitesBaseTests): # because it uses a inet_pton / inet_ntop round trip to # ascertain correctness. - "::ffff:0:0/96", #this one fails on WIN2012r2 + "::ffff:0:0/96", # this one fails on WIN2012r2 "::ffff:aaaa:a000/120", "::ffff:10:0/120", "::ffff:2:300/120", diff --git a/source4/dsdb/tests/python/user_account_control.py b/source4/dsdb/tests/python/user_account_control.py index 6a53e5bef6b..e9f9b96538e 100755 --- a/source4/dsdb/tests/python/user_account_control.py +++ b/source4/dsdb/tests/python/user_account_control.py @@ -115,7 +115,7 @@ class UserAccountControlTests(samba.tests.TestCase): creds_tmp.set_workstation(creds.get_workstation()) creds_tmp.set_gensec_features(creds_tmp.get_gensec_features() | gensec.FEATURE_SEAL) - creds_tmp.set_kerberos_state(DONT_USE_KERBEROS) # kinit is too expensive to use in a tight loop + creds_tmp.set_kerberos_state(DONT_USE_KERBEROS) # kinit is too expensive to use in a tight loop return creds_tmp def setUp(self): diff --git a/source4/lib/wmi/wmi.py b/source4/lib/wmi/wmi.py index bdb0dd12461..7da465b0b70 100644 --- a/source4/lib/wmi/wmi.py +++ b/source4/lib/wmi/wmi.py @@ -9,7 +9,7 @@ new_instancemethod = new.instancemethod try: _swig_property = property except NameError: - pass # Python < 2.2 doesn't have 'property'. + pass # Python < 2.2 doesn't have 'property'. def _swig_setattr_nondynamic(self, class_type, name, value, static=1): if (name == "thisown"): return self.this.own(value) if (name == "this"): diff --git a/source4/torture/drs/python/cracknames.py b/source4/torture/drs/python/cracknames.py index 092f2046654..7df12ad14dd 100644 --- a/source4/torture/drs/python/cracknames.py +++ b/source4/torture/drs/python/cracknames.py @@ -192,7 +192,7 @@ class DrsCracknamesTestCase(drs_base.DrsBaseTestCase): names = drsuapi.DsNameString() names.str = name - req.codepage = 1252 # German, but it doesn't really matter here + req.codepage = 1252 # German, but it doesn't really matter here req.language = 1033 req.format_flags = 0 req.format_offered = format_offered diff --git a/source4/torture/drs/python/repl_rodc.py b/source4/torture/drs/python/repl_rodc.py index 8bf3c1e0f65..0ecc0bc5051 100644 --- a/source4/torture/drs/python/repl_rodc.py +++ b/source4/torture/drs/python/repl_rodc.py @@ -198,7 +198,7 @@ class DrsRodcTestCase(drs_base.DrsBaseTestCase): self.fail("Successfully replicated secrets to an RODC that shouldn't have been replicated.") except WERRORError as e: (enum, estr) = e.args - self.assertEquals(enum, 8630) # ERROR_DS_DRA_SECRETS_DENIED + self.assertEquals(enum, 8630) # ERROR_DS_DRA_SECRETS_DENIED # send the same request again and we should get the same response try: @@ -206,7 +206,7 @@ class DrsRodcTestCase(drs_base.DrsBaseTestCase): self.fail("Successfully replicated secrets to an RODC that shouldn't have been replicated.") except WERRORError as e1: (enum, estr) = e1.args - self.assertEquals(enum, 8630) # ERROR_DS_DRA_SECRETS_DENIED + self.assertEquals(enum, 8630) # ERROR_DS_DRA_SECRETS_DENIED # Retry with Administrator credentials, ignores password replication groups (level, ctr) = self.drs.DsGetNCChanges(self.drs_handle, 10, req10) @@ -511,7 +511,7 @@ class DrsRodcTestCase(drs_base.DrsBaseTestCase): self.fail("Successfully replicated secrets to an RODC that shouldn't have been replicated.") except WERRORError as e3: (enum, estr) = e3.args - self.assertEquals(enum, 8630) # ERROR_DS_DRA_SECRETS_DENIED + self.assertEquals(enum, 8630) # ERROR_DS_DRA_SECRETS_DENIED req10 = self._getnc_req10(dest_dsa=str(self.rodc_ctx.ntds_guid), invocation_id=self.ldb_dc1.get_invocation_id(), @@ -526,7 +526,7 @@ class DrsRodcTestCase(drs_base.DrsBaseTestCase): self.fail("Successfully replicated secrets to an RODC that shouldn't have been replicated.") except WERRORError as e4: (enum, estr) = e4.args - self.assertEquals(enum, 8630) # ERROR_DS_DRA_SECRETS_DENIED + self.assertEquals(enum, 8630) # ERROR_DS_DRA_SECRETS_DENIED def test_msDSRevealedUsers_local_deny_allow(self): """ @@ -596,7 +596,7 @@ class DrsRodcTestCase(drs_base.DrsBaseTestCase): self.fail("Successfully replicated secrets to an RODC that shouldn't have been replicated.") except WERRORError as e5: (enum, estr) = e5.args - self.assertEquals(enum, 8630) # ERROR_DS_DRA_SECRETS_DENIED + self.assertEquals(enum, 8630) # ERROR_DS_DRA_SECRETS_DENIED m = ldb.Message() m.dn = ldb.Dn(self.ldb_dc1, self.computer_dn) @@ -613,7 +613,7 @@ class DrsRodcTestCase(drs_base.DrsBaseTestCase): self.fail("Successfully replicated secrets to an RODC that shouldn't have been replicated.") except WERRORError as e6: (enum, estr) = e6.args - self.assertEquals(enum, 8630) # ERROR_DS_DRA_SECRETS_DENIED + self.assertEquals(enum, 8630) # ERROR_DS_DRA_SECRETS_DENIED def _assert_in_revealed_users(self, user_dn, attrlist): res = self.ldb_dc1.search(scope=ldb.SCOPE_BASE, base=self.computer_dn, diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py index 5a27c0edb86..0157fc73a9f 100755 --- a/wintest/test-s4-howto.py +++ b/wintest/test-s4-howto.py @@ -216,7 +216,7 @@ def test_dcpromo(t, vm): "Last attempt .* was successful", "CN=Configuration,${BASEDN}", "Last attempt .* was successful", - "CN=Configuration,${BASEDN}", # cope with either order + "CN=Configuration,${BASEDN}", # cope with either order "Last attempt .* was successful", "OUTBOUND NEIGHBORS", "${BASEDN}", diff --git a/wintest/wintest.py b/wintest/wintest.py index b3ef09066d8..d421369086a 100644 --- a/wintest/wintest.py +++ b/wintest/wintest.py @@ -866,7 +866,7 @@ RebootOnCompletion=No i = child.expect(["You must restart this computer", "failed", "Active Directory Domain Services was not installed", "C:", pexpect.TIMEOUT], timeout=240) if i == 1 or i == 2: raise Exception("dcpromo failed") - if i == 4: # timeout + if i == 4: # timeout child = self.open_telnet("${WIN_HOSTNAME}", "administrator", "${WIN_PASS}") child.sendline("shutdown -r -t 0") |