PEP8: fix E713: test for membership should be 'not in'

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>

diff --git a/lib/ldb-samba/tests/match_rules.py b/lib/ldb-samba/tests/match_rules.py
index aaa9675c1960bf19f14696efefee0352505a9e38..7c472816f8df08de046ce87ccc9b59faf05d5c3d 100755 (executable)
--- a/lib/ldb-samba/tests/match_rules.py
+++ b/lib/ldb-samba/tests/match_rules.py
@@ -1774,7 +1774,7 @@ host = args[0]
 lp = sambaopts.get_loadparm()
 creds = credopts.get_credentials(lp)
 
-if not "://" in host:
+if "://" not in host:
     if os.path.isfile(host):
         host = "tdb://%s" % host
     else:

diff --git a/python/samba/__init__.py b/python/samba/__init__.py
index c95b2fe3e26acb333e13927e6669ab74e836b1ed..291ef541189891d55dd3fe9ff86a001ee9f738a6 100644 (file)
--- a/python/samba/__init__.py
+++ b/python/samba/__init__.py
@@ -340,7 +340,7 @@ def import_bundled_package(modulename, location, source_tree_container,
     if in_source_tree():
         extra_path = os.path.join(source_tree_topdir(), source_tree_container,
                                   location)
-        if not extra_path in sys.path:
+        if extra_path not in sys.path:
             sys.path.insert(0, extra_path)
         sys.modules[modulename] = __import__(modulename)
     else:

diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py
index dfdbcf46655e82dd9bfb54e1a23ee801545b928c..ae93ed1c72ffa3b94d2e23d929dda89ac0452706 100644 (file)
--- a/python/samba/dbchecker.py
+++ b/python/samba/dbchecker.py
@@ -1232,7 +1232,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
             is_deleted = 'isDeleted' in obj and obj['isDeleted'][0].upper() == 'TRUE'
             target_is_deleted = 'isDeleted' in res[0] and res[0]['isDeleted'][0].upper() == 'TRUE'
 
-            if is_deleted and not obj.dn in self.deleted_objects_containers and linkID:
+            if is_deleted and obj.dn not in self.deleted_objects_containers and linkID:
                 # A fully deleted object should not have any linked
                 # attributes. (MS-ADTS 3.1.1.5.5.1.1 Tombstone
                 # Requirements and 3.1.1.5.5.1.3 Recycled-Object
@@ -2470,7 +2470,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
         error_count = 0
 
         # check that the dsServiceName is in GUID form
-        if not 'dsServiceName' in obj:
+        if 'dsServiceName' not in obj:
             self.report('ERROR: dsServiceName missing in @ROOTDSE')
             return error_count + 1
 

diff --git a/python/samba/gpclass.py b/python/samba/gpclass.py
index 22f57c0dd95a47da6b318c3e6b55b8ad3fc5b228..8fb2f9344a6a3aead8ce963042746e23fc051223 100644 (file)
--- a/python/samba/gpclass.py
+++ b/python/samba/gpclass.py
@@ -448,7 +448,7 @@ def check_safe_path(path):
     dirs = re.split('/|\\\\', path)
     if 'sysvol' in path:
         dirs = dirs[dirs.index('sysvol') + 1:]
-    if not '..' in dirs:
+    if '..' not in dirs:
         return os.path.join(*dirs)
     raise OSError(path)
 
@@ -567,7 +567,7 @@ def register_gp_extension(guid, name, path,
         return False
 
     lp, parser = parse_gpext_conf(smb_conf)
-    if not guid in parser.sections():
+    if guid not in parser.sections():
         parser.add_section(guid)
     parser.set(guid, 'DllName', path)
     parser.set(guid, 'ProcessGroupPolicy', name)

diff --git a/python/samba/join.py b/python/samba/join.py
index 66097b9c596a567b00b7ff484da7aa9bada0b8b7..44bad58c9f4316121ac037b4fdf73a1f9f3c4088 100644 (file)
--- a/python/samba/join.py
+++ b/python/samba/join.py
@@ -381,7 +381,7 @@ class DCJoinContext(object):
         '''get the parent domain partition DN from parent DNS name'''
         res = ctx.samdb.search(base='CN=Partitions,%s' % ctx.config_dn, attrs=['fSMORoleOwner'],
                                scope=ldb.SCOPE_BASE, controls=["extended_dn:1:1"])
-        if not 'fSMORoleOwner' in res[0]:
+        if 'fSMORoleOwner' not in res[0]:
             raise DCJoinException("Can't find naming master on partition DN %s in %s" % (ctx.partition_dn, ctx.samdb.url))
         try:
             master_guid = str(misc.GUID(ldb.Dn(ctx.samdb, res[0]['fSMORoleOwner'][0].decode('utf8')).get_extended_component('GUID')))

diff --git a/python/samba/kcc/__init__.py b/python/samba/kcc/__init__.py
index 8bb9a3904bbf377c5d49ed562cb8ba824eb73be1..5e1762d5b6f3a1f19db56172dc4e11c0c29961de 100644 (file)
--- a/python/samba/kcc/__init__.py
+++ b/python/samba/kcc/__init__.py
@@ -2056,7 +2056,7 @@ class KCC(object):
         for dc_s in self.my_site.dsa_table.values():
             # If this partition (nc_x) doesn't appear as a
             # replica (f_of_x) on (dc_s) then continue
-            if not nc_x.nc_dnstr in dc_s.current_rep_table:
+            if nc_x.nc_dnstr not in dc_s.current_rep_table:
                 continue
 
             # Pull out the NCReplica (f) of (x) with the dn
@@ -2138,7 +2138,7 @@ class KCC(object):
                 # If this partition NC (x) doesn't appear as a
                 # replica (p) of NC (x) on the dsa DC (s) then
                 # continue
-                if not nc_x.nc_dnstr in dc_s.current_rep_table:
+                if nc_x.nc_dnstr not in dc_s.current_rep_table:
                     continue
 
                 # Pull out the NCReplica with the dn that

diff --git a/python/samba/kcc/kcc_utils.py b/python/samba/kcc/kcc_utils.py
index a1dda6b5e0266d5c935d9ddcd2a9210225365219..c099140c9363cee4d616772213d002d19cd59808 100644 (file)
--- a/python/samba/kcc/kcc_utils.py
+++ b/python/samba/kcc/kcc_utils.py
@@ -744,7 +744,7 @@ class DirectoryServiceAgent(object):
                     flags = dsdn.get_binary_integer()
                     dnstr = str(dsdn.dn)
 
-                    if not dnstr in tmp_table:
+                    if dnstr not in tmp_table:
                         rep = NCReplica(self, dnstr)
                         tmp_table[dnstr] = rep
                     else:

diff --git a/python/samba/netcmd/dbcheck.py b/python/samba/netcmd/dbcheck.py
index 3a940bf6d6a472d87738efac9bca733d7a319aa6..6369e7fbb09111f0b6baabbe4b19c1bec169e633 100644 (file)
--- a/python/samba/netcmd/dbcheck.py
+++ b/python/samba/netcmd/dbcheck.py
@@ -110,7 +110,7 @@ class cmd_dbcheck(Command):
 
         scope_map = {"SUB": ldb.SCOPE_SUBTREE, "BASE": ldb.SCOPE_BASE, "ONE": ldb.SCOPE_ONELEVEL}
         scope = scope.upper()
-        if not scope in scope_map:
+        if scope not in scope_map:
             raise CommandError("Unknown scope %s" % scope)
         search_scope = scope_map[scope]
 

diff --git a/python/samba/netcmd/ldapcmp.py b/python/samba/netcmd/ldapcmp.py
index bcd9c63150b60b5ce6545f9a1f58103f76e9f9ba..635b197eb19399399b29099baeb29f1c165158a2 100644 (file)
--- a/python/samba/netcmd/ldapcmp.py
+++ b/python/samba/netcmd/ldapcmp.py
@@ -49,7 +49,7 @@ class LDAPBase(object):
                  outf=sys.stdout, errf=sys.stderr, skip_missing_dn=True):
         ldb_options = []
         samdb_url = host
-        if not "://" in host:
+        if "://" not in host:
             if os.path.isfile(host):
                 samdb_url = "tdb://%s" % host
             else:
@@ -580,7 +580,7 @@ class LDAPObject(object):
             #
             title = 4 * " " + "Attributes found only in %s:" % self.con.host
             for x in self.attributes.keys():
-                if not x in other.attributes.keys() and \
+                if x not in other.attributes.keys() and \
                     not x.upper() in [q.upper() for q in other.ignore_attributes]:
                     if title:
                         res += title + "\n"
@@ -590,7 +590,7 @@ class LDAPObject(object):
             #
             title = 4 *" " + "Attributes found only in %s:" % other.con.host
             for x in other.attributes.keys():
-                if not x in self.attributes.keys() and \
+                if x not in self.attributes.keys() and \
                     not x.upper() in [q.upper() for q in self.ignore_attributes]:
                     if title:
                         res += title + "\n"

diff --git a/python/samba/samba3/__init__.py b/python/samba/samba3/__init__.py
index 1f8c5100bcb37e6302449505ac5d3b0414871b69..78588e0c349dc2c4cf9b6c2b36fa3ad317dfbba0 100644 (file)
--- a/python/samba/samba3/__init__.py
+++ b/python/samba/samba3/__init__.py
@@ -337,7 +337,7 @@ class WinsDatabase(object):
                 ips.append(entries[i])
                 i += 1
             nb_flags = int(entries[i][:-1], 16)
-            assert not name in self.entries, "Name %s exists twice" % name
+            assert name not in self.entries, "Name %s exists twice" % name
             self.entries[name] = (ttl, ips, nb_flags)
         f.close()
 

diff --git a/python/samba/samdb.py b/python/samba/samdb.py
index 50c4821f542ba1405378914f87af7169dd55cfd7..e91cf6516e79a085fb7b0867bd191518b0934afe 100644 (file)
--- a/python/samba/samdb.py
+++ b/python/samba/samdb.py
@@ -929,7 +929,7 @@ schemaUpdateNow: 1
         res = self.search(self.domain_dn(), scope=ldb.SCOPE_BASE, attrs=["minPwdAge"])
         if len(res) == 0:
             return None
-        elif not "minPwdAge" in res[0]:
+        elif "minPwdAge" not in res[0]:
             return None
         else:
             return int(res[0]["minPwdAge"][0])
@@ -945,7 +945,7 @@ schemaUpdateNow: 1
         res = self.search(self.domain_dn(), scope=ldb.SCOPE_BASE, attrs=["maxPwdAge"])
         if len(res) == 0:
             return None
-        elif not "maxPwdAge" in res[0]:
+        elif "maxPwdAge" not in res[0]:
             return None
         else:
             return int(res[0]["maxPwdAge"][0])
@@ -961,7 +961,7 @@ schemaUpdateNow: 1
         res = self.search(self.domain_dn(), scope=ldb.SCOPE_BASE, attrs=["minPwdLength"])
         if len(res) == 0:
             return None
-        elif not "minPwdLength" in res[0]:
+        elif "minPwdLength" not in res[0]:
             return None
         else:
             return int(res[0]["minPwdLength"][0])
@@ -977,7 +977,7 @@ schemaUpdateNow: 1
         res = self.search(self.domain_dn(), scope=ldb.SCOPE_BASE, attrs=["pwdProperties"])
         if len(res) == 0:
             return None
-        elif not "pwdProperties" in res[0]:
+        elif "pwdProperties" not in res[0]:
             return None
         else:
             return int(res[0]["pwdProperties"][0])

diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py
index b3fccee838348ba74e6504b1b6bedd7cff6d22a4..870258a6fb9b5bde588ae28474a83a0487777511 100644 (file)
--- a/python/samba/tests/__init__.py
+++ b/python/samba/tests/__init__.py
@@ -417,7 +417,7 @@ def connect_samdb(samdb_url, lp=None, session_info=None, credentials=None,
     to make proper URL for ldb.connect() while using default
     parameters for connection based on test environment
     """
-    if not "://" in samdb_url:
+    if "://" not in samdb_url:
         if not ldap_only and os.path.isfile(samdb_url):
             samdb_url = "tdb://%s" % samdb_url
         else:

diff --git a/python/samba/tests/samba3sam.py b/python/samba/tests/samba3sam.py
index 5223e7cee6027d72866f74f258eed26831ef2d2c..bb8eff26a900d3d8057d2176864dd2acfb84f439 100644 (file)
--- a/python/samba/tests/samba3sam.py
+++ b/python/samba/tests/samba3sam.py
@@ -285,7 +285,7 @@ delete: description
         # Checking whether changes are no longer there...
         msg = self.ldb.search(expression="(cn=Niemand)")
         self.assertTrue(len(msg) >= 1)
-        self.assertTrue(not "description" in msg[0])
+        self.assertTrue("description" not in msg[0])
 
         # Renaming record...
         self.ldb.rename("cn=Niemand,cn=Users,dc=vernstok,dc=nl",
@@ -411,7 +411,7 @@ objectSid: S-1-5-21-4231626423-2410014848-2360679739-1052
                               attrs=["dnsHostName", "lastLogon"])
         self.assertEquals(len(res), 1)
         self.assertEquals(str(res[0].dn), dn)
-        self.assertTrue(not "dnsHostName" in res[0])
+        self.assertTrue("dnsHostName" not in res[0])
         self.assertEquals(str(res[0]["lastLogon"]), "x")
 
         # Search remote record by remote DN
@@ -420,8 +420,8 @@ objectSid: S-1-5-21-4231626423-2410014848-2360679739-1052
                                     attrs=["dnsHostName", "lastLogon", "sambaLogonTime"])
         self.assertEquals(len(res), 1)
         self.assertEquals(str(res[0].dn), dn)
-        self.assertTrue(not "dnsHostName" in res[0])
-        self.assertTrue(not "lastLogon" in res[0])
+        self.assertTrue("dnsHostName" not in res[0])
+        self.assertTrue("lastLogon" not in res[0])
         self.assertEquals(str(res[0]["sambaLogonTime"]), "x")
 
         # Search split record by local DN
@@ -439,8 +439,8 @@ objectSid: S-1-5-21-4231626423-2410014848-2360679739-1052
                                     attrs=["dnsHostName", "lastLogon", "sambaLogonTime"])
         self.assertEquals(len(res), 1)
         self.assertEquals(str(res[0].dn), dn)
-        self.assertTrue(not "dnsHostName" in res[0])
-        self.assertTrue(not "lastLogon" in res[0])
+        self.assertTrue("dnsHostName" not in res[0])
+        self.assertTrue("lastLogon" not in res[0])
         self.assertEquals(str(res[0]["sambaLogonTime"]), "x")
 
         # Testing search by attribute
@@ -463,7 +463,7 @@ objectSid: S-1-5-21-4231626423-2410014848-2360679739-1052
         self.assertEquals(len(res), 2)
         res = sorted(res, key=attrgetter('dn'))
         self.assertEquals(str(res[0].dn), self.samba4.dn("cn=C"))
-        self.assertTrue(not "dnsHostName" in res[0])
+        self.assertTrue("dnsHostName" not in res[0])
         self.assertEquals(str(res[0]["lastLogon"]), "z")
         self.assertEquals(str(res[1].dn), self.samba4.dn("cn=Z"))
         self.assertEquals(str(res[1]["dnsHostName"]), "z")
@@ -475,10 +475,10 @@ objectSid: S-1-5-21-4231626423-2410014848-2360679739-1052
         self.assertEquals(len(res), 2)
         res = sorted(res, key=attrgetter('dn'))
         self.assertEquals(str(res[0].dn), self.samba4.dn("cn=A"))
-        self.assertTrue(not "dnsHostName" in res[0])
+        self.assertTrue("dnsHostName" not in res[0])
         self.assertEquals(str(res[0]["lastLogon"]), "x")
         self.assertEquals(str(res[1].dn), self.samba4.dn("cn=B"))
-        self.assertTrue(not "dnsHostName" in res[1])
+        self.assertTrue("dnsHostName" not in res[1])
         self.assertEquals(str(res[1]["lastLogon"]), "y")
 
         # Search by converted attribute
@@ -496,7 +496,7 @@ objectSid: S-1-5-21-4231626423-2410014848-2360679739-1052
                              res[1]["objectSid"])
         self.assertTrue("objectSid" in res[1])
         self.assertEquals(str(res[0].dn), self.samba4.dn("cn=A"))
-        self.assertTrue(not "dnsHostName" in res[0])
+        self.assertTrue("dnsHostName" not in res[0])
         self.assertEquals(str(res[0]["lastLogon"]), "x")
         self.assertSidEquals("S-1-5-21-4231626423-2410014848-2360679739-1052",
                              res[0]["objectSid"])
@@ -509,7 +509,7 @@ objectSid: S-1-5-21-4231626423-2410014848-2360679739-1052
                               attrs=["dnsHostName", "lastLogon", "primaryGroupID"])
         self.assertEquals(len(res), 1)
         self.assertEquals(str(res[0].dn), self.samba4.dn("cn=A"))
-        self.assertTrue(not "dnsHostName" in res[0])
+        self.assertTrue("dnsHostName" not in res[0])
         self.assertEquals(str(res[0]["lastLogon"]), "x")
         self.assertEquals(str(res[0]["primaryGroupID"]), "512")
 
@@ -535,7 +535,7 @@ objectSid: S-1-5-21-4231626423-2410014848-2360679739-1052
         self.assertEquals(len(res), 2)
         res = sorted(res, key=attrgetter('dn'))
         self.assertEquals(str(res[0].dn), self.samba4.dn("cn=A"))
-        self.assertTrue(not "dnsHostName" in res[0])
+        self.assertTrue("dnsHostName" not in res[0])
         self.assertEquals(str(res[0]["lastLogon"]), "x")
         self.assertEquals(str(res[0]["objectClass"][0]), "user")
         self.assertEquals(str(res[1].dn), self.samba4.dn("cn=X"))
@@ -549,11 +549,11 @@ objectSid: S-1-5-21-4231626423-2410014848-2360679739-1052
         self.assertEquals(len(res), 3)
         res = sorted(res, key=attrgetter('dn'))
         self.assertEquals(str(res[0].dn), self.samba4.dn("cn=A"))
-        self.assertTrue(not "dnsHostName" in res[0])
+        self.assertTrue("dnsHostName" not in res[0])
         self.assertEquals(str(res[0]["lastLogon"]), "x")
         self.assertEquals(res[0]["objectClass"][0], "user")
         self.assertEquals(str(res[1].dn), self.samba4.dn("cn=B"))
-        self.assertTrue(not "dnsHostName" in res[1])
+        self.assertTrue("dnsHostName" not in res[1])
         self.assertEquals(str(res[1]["lastLogon"]), "y")
         self.assertEquals(set(res[1]["objectClass"]), set(["top"]))
         self.assertEquals(str(res[2].dn), self.samba4.dn("cn=X"))
@@ -581,7 +581,7 @@ objectSid: S-1-5-21-4231626423-2410014848-2360679739-1052
         self.assertEquals(len(res), 2)
         res = sorted(res, key=attrgetter('dn'))
         self.assertEquals(str(res[0].dn), self.samba4.dn("cn=A"))
-        self.assertTrue(not "dnsHostName" in res[0])
+        self.assertTrue("dnsHostName" not in res[0])
         self.assertEquals(str(res[0]["lastLogon"]), "x")
         self.assertEquals(str(res[1].dn), self.samba4.dn("cn=X"))
         self.assertEquals(str(res[1]["dnsHostName"]), "x")
@@ -661,13 +661,13 @@ objectSid: S-1-5-21-4231626423-2410014848-2360679739-1052
         self.assertEquals(len(res), 6)
         res = sorted(res, key=attrgetter('dn'))
         self.assertEquals(str(res[0].dn), self.samba4.dn("cn=A"))
-        self.assertTrue(not "dnsHostName" in res[0])
+        self.assertTrue("dnsHostName" not in res[0])
         self.assertEquals(str(res[0]["lastLogon"]), "x")
         self.assertEquals(str(res[1].dn), self.samba4.dn("cn=B"))
-        self.assertTrue(not "dnsHostName" in res[1])
+        self.assertTrue("dnsHostName" not in res[1])
         self.assertEquals(str(res[1]["lastLogon"]), "y")
         self.assertEquals(str(res[2].dn), self.samba4.dn("cn=C"))
-        self.assertTrue(not "dnsHostName" in res[2])
+        self.assertTrue("dnsHostName" not in res[2])
         self.assertEquals(str(res[2]["lastLogon"]), "z")
         self.assertEquals(str(res[3].dn), self.samba4.dn("cn=Z"))
         self.assertEquals(str(res[3]["dnsHostName"]), "z")
@@ -679,7 +679,7 @@ objectSid: S-1-5-21-4231626423-2410014848-2360679739-1052
         self.assertEquals(len(res), 4)
         res = sorted(res, key=attrgetter('dn'))
         self.assertEquals(str(res[0].dn), self.samba4.dn("cn=C"))
-        self.assertTrue(not "dnsHostName" in res[0])
+        self.assertTrue("dnsHostName" not in res[0])
         self.assertEquals(str(res[0]["lastLogon"]), "z")
         self.assertEquals(str(res[1].dn), self.samba4.dn("cn=Z"))
         self.assertEquals(str(res[1]["dnsHostName"]), "z")
@@ -691,13 +691,13 @@ objectSid: S-1-5-21-4231626423-2410014848-2360679739-1052
         self.assertEquals(len(res), 6)
         res = sorted(res, key=attrgetter('dn'))
         self.assertEquals(str(res[0].dn), self.samba4.dn("cn=A"))
-        self.assertTrue(not "dnsHostName" in res[0])
+        self.assertTrue("dnsHostName" not in res[0])
         self.assertEquals(str(res[0]["lastLogon"]), "x")
         self.assertEquals(str(res[1].dn), self.samba4.dn("cn=B"))
-        self.assertTrue(not "dnsHostName" in res[1])
+        self.assertTrue("dnsHostName" not in res[1])
         self.assertEquals(str(res[1]["lastLogon"]), "y")
         self.assertEquals(str(res[2].dn), self.samba4.dn("cn=C"))
-        self.assertTrue(not "dnsHostName" in res[2])
+        self.assertTrue("dnsHostName" not in res[2])
         self.assertEquals(str(res[2]["lastLogon"]), "z")
         self.assertEquals(str(res[3].dn), self.samba4.dn("cn=Z"))
         self.assertEquals(str(res[3]["dnsHostName"]), "z")
@@ -709,10 +709,10 @@ objectSid: S-1-5-21-4231626423-2410014848-2360679739-1052
         self.assertEquals(len(res), 6)
         res = sorted(res, key=attrgetter('dn'))
         self.assertEquals(str(res[0].dn), self.samba4.dn("cn=B"))
-        self.assertTrue(not "dnsHostName" in res[0])
+        self.assertTrue("dnsHostName" not in res[0])
         self.assertEquals(str(res[0]["lastLogon"]), "y")
         self.assertEquals(str(res[1].dn), self.samba4.dn("cn=C"))
-        self.assertTrue(not "dnsHostName" in res[1])
+        self.assertTrue("dnsHostName" not in res[1])
         self.assertEquals(str(res[1]["lastLogon"]), "z")
         self.assertEquals(str(res[2].dn), self.samba4.dn("cn=Y"))
         self.assertEquals(str(res[2]["dnsHostName"]), "y")
@@ -727,13 +727,13 @@ objectSid: S-1-5-21-4231626423-2410014848-2360679739-1052
         self.assertEquals(len(res), 6)
         res = sorted(res, key=attrgetter('dn'))
         self.assertEquals(str(res[0].dn), self.samba4.dn("cn=A"))
-        self.assertTrue(not "dnsHostName" in res[0])
+        self.assertTrue("dnsHostName" not in res[0])
         self.assertEquals(str(res[0]["lastLogon"]), "x")
         self.assertEquals(str(res[1].dn), self.samba4.dn("cn=B"))
-        self.assertTrue(not "dnsHostName" in res[1])
+        self.assertTrue("dnsHostName" not in res[1])
         self.assertEquals(str(res[1]["lastLogon"]), "y")
         self.assertEquals(str(res[2].dn), self.samba4.dn("cn=C"))
-        self.assertTrue(not "dnsHostName" in res[2])
+        self.assertTrue("dnsHostName" not in res[2])
         self.assertEquals(str(res[2]["lastLogon"]), "z")
         self.assertEquals(str(res[3].dn), self.samba4.dn("cn=Z"))
         self.assertEquals(str(res[3]["dnsHostName"]), "z")
@@ -744,13 +744,13 @@ objectSid: S-1-5-21-4231626423-2410014848-2360679739-1052
                               attrs=["dnsHostName", "lastLogon"])
         res = sorted(res, key=attrgetter('dn'))
         self.assertEquals(str(res[0].dn), self.samba4.dn("cn=A"))
-        self.assertTrue(not "dnsHostName" in res[0])
+        self.assertTrue("dnsHostName" not in res[0])
         self.assertEquals(str(res[0]["lastLogon"]), "x")
         self.assertEquals(str(res[1].dn), self.samba4.dn("cn=B"))
-        self.assertTrue(not "dnsHostName" in res[1])
+        self.assertTrue("dnsHostName" not in res[1])
         self.assertEquals(str(res[1]["lastLogon"]), "y")
         self.assertEquals(str(res[2].dn), self.samba4.dn("cn=C"))
-        self.assertTrue(not "dnsHostName" in res[2])
+        self.assertTrue("dnsHostName" not in res[2])
         self.assertEquals(str(res[2]["lastLogon"]), "z")
         self.assertEquals(str(res[3].dn), self.samba4.dn("cn=Z"))
         self.assertEquals(str(res[3]["dnsHostName"]), "z")
@@ -762,7 +762,7 @@ objectSid: S-1-5-21-4231626423-2410014848-2360679739-1052
         self.assertEquals(len(res), 5)
         res = sorted(res, key=attrgetter('dn'))
         self.assertEquals(str(res[0].dn), self.samba4.dn("cn=C"))
-        self.assertTrue(not "dnsHostName" in res[0])
+        self.assertTrue("dnsHostName" not in res[0])
         self.assertEquals(str(res[0]["lastLogon"]), "z")
         self.assertEquals(str(res[1].dn), self.samba4.dn("cn=Y"))
         self.assertEquals(str(res[1]["dnsHostName"]), "y")
@@ -777,10 +777,10 @@ objectSid: S-1-5-21-4231626423-2410014848-2360679739-1052
         self.assertEquals(len(res), 5)
         res = sorted(res, key=attrgetter('dn'))
         self.assertEquals(str(res[0].dn), self.samba4.dn("cn=A"))
-        self.assertTrue(not "dnsHostName" in res[0])
+        self.assertTrue("dnsHostName" not in res[0])
         self.assertEquals(str(res[0]["lastLogon"]), "x")
         self.assertEquals(str(res[1].dn), self.samba4.dn("cn=C"))
-        self.assertTrue(not "dnsHostName" in res[1])
+        self.assertTrue("dnsHostName" not in res[1])
         self.assertEquals(str(res[1]["lastLogon"]), "z")
         self.assertEquals(str(res[2].dn), self.samba4.dn("cn=Z"))
         self.assertEquals(str(res[2]["dnsHostName"]), "z")
@@ -791,13 +791,13 @@ objectSid: S-1-5-21-4231626423-2410014848-2360679739-1052
         self.assertEquals(len(res), 7)
         res = sorted(res, key=attrgetter('dn'))
         self.assertEquals(str(res[0].dn), self.samba4.dn("cn=A"))
-        self.assertTrue(not "dnsHostName" in res[0])
+        self.assertTrue("dnsHostName" not in res[0])
         self.assertEquals(str(res[0]["lastLogon"]), "x")
         self.assertEquals(str(res[1].dn), self.samba4.dn("cn=B"))
-        self.assertTrue(not "dnsHostName" in res[1])
+        self.assertTrue("dnsHostName" not in res[1])
         self.assertEquals(str(res[1]["lastLogon"]), "y")
         self.assertEquals(str(res[2].dn), self.samba4.dn("cn=C"))
-        self.assertTrue(not "dnsHostName" in res[2])
+        self.assertTrue("dnsHostName" not in res[2])
         self.assertEquals(str(res[2]["lastLogon"]), "z")
         self.assertEquals(str(res[3].dn), self.samba4.dn("cn=X"))
         self.assertEquals(str(res[3]["dnsHostName"]), "x")
@@ -991,12 +991,12 @@ description: test
         self.assertEquals(len(res), 1)
         self.assertEquals(str(res[0].dn), dn2)
         self.assertEquals(str(res[0]["description"]), "test")
-        self.assertTrue(not "revision" in res[0])
+        self.assertTrue("revision" not in res[0])
         # Check in local db
         res = self.samba4.db.search(dn, scope=SCOPE_BASE, attrs=attrs)
         self.assertEquals(len(res), 1)
         self.assertEquals(str(res[0].dn), dn)
-        self.assertTrue(not "description" in res[0])
+        self.assertTrue("description" not in res[0])
         self.assertEquals(str(res[0]["revision"]), "1")
 
         # Delete (newly) split record
@@ -1027,9 +1027,9 @@ description: test
         res = self.samba4.db.search(dn, scope=SCOPE_BASE, attrs=attrs)
         self.assertEquals(len(res), 1)
         self.assertEquals(str(res[0].dn), dn)
-        self.assertTrue(not "description" in res[0])
-        self.assertTrue(not "badPwdCount" in res[0])
-        self.assertTrue(not "nextRid" in res[0])
+        self.assertTrue("description" not in res[0])
+        self.assertTrue("badPwdCount" not in res[0])
+        self.assertTrue("nextRid" not in res[0])
         self.assertEquals(str(res[0]["revision"]), "1")
         # Check in remote db
         attrs = ["description", "sambaBadPasswordCount", "sambaNextRid",
@@ -1040,7 +1040,7 @@ description: test
         self.assertEquals(str(res[0]["description"]), "foo")
         self.assertEquals(str(res[0]["sambaBadPasswordCount"]), "3")
         self.assertEquals(str(res[0]["sambaNextRid"]), "1001")
-        self.assertTrue(not "revision" in res[0])
+        self.assertTrue("revision" not in res[0])
 
         # Modify of split record
         ldif = """
@@ -1066,9 +1066,9 @@ revision: 2
         res = self.samba4.db.search(dn, scope=SCOPE_BASE, attrs=attrs)
         self.assertEquals(len(res), 1)
         self.assertEquals(str(res[0].dn), dn)
-        self.assertTrue(not "description" in res[0])
-        self.assertTrue(not "badPwdCount" in res[0])
-        self.assertTrue(not "nextRid" in res[0])
+        self.assertTrue("description" not in res[0])
+        self.assertTrue("badPwdCount" not in res[0])
+        self.assertTrue("nextRid" not in res[0])
         self.assertEquals(str(res[0]["revision"]), "2")
         # Check in remote db
         attrs = ["description", "sambaBadPasswordCount", "sambaNextRid",
@@ -1079,7 +1079,7 @@ revision: 2
         self.assertEquals(str(res[0]["description"]), "test")
         self.assertEquals(str(res[0]["sambaBadPasswordCount"]), "4")
         self.assertEquals(str(res[0]["sambaNextRid"]), "1001")
-        self.assertTrue(not "revision" in res[0])
+        self.assertTrue("revision" not in res[0])
 
         # Rename split record
         dn2 = self.samba4.dn("cn=toast")
@@ -1098,9 +1098,9 @@ revision: 2
         res = self.samba4.db.search(dn, scope=SCOPE_BASE, attrs=attrs)
         self.assertEquals(len(res), 1)
         self.assertEquals(str(res[0].dn), dn)
-        self.assertTrue(not "description" in res[0])
-        self.assertTrue(not "badPwdCount" in res[0])
-        self.assertTrue(not "nextRid" in res[0])
+        self.assertTrue("description" not in res[0])
+        self.assertTrue("badPwdCount" not in res[0])
+        self.assertTrue("nextRid" not in res[0])
         self.assertEquals(str(res[0]["revision"]), "2")
         # Check in remote db
         dn2 = self.samba3.dn("cn=toast")
@@ -1112,7 +1112,7 @@ revision: 2
         self.assertEquals(str(res[0]["description"]), "test")
         self.assertEquals(str(res[0]["sambaBadPasswordCount"]), "4")
         self.assertEquals(str(res[0]["sambaNextRid"]), "1001")
-        self.assertTrue(not "revision" in res[0])
+        self.assertTrue("revision" not in res[0])
 
         # Delete split record
         self.ldb.delete(dn)

diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py
index a393b70cc908d33a8bec418954b4c31af62147d7..f7ab805cbaa3426305c187ded2d148375ab95a01 100644 (file)
--- a/selftest/selftesthelpers.py
+++ b/selftest/selftesthelpers.py
@@ -106,9 +106,9 @@ def plantestsuite_loadlist(name, env, cmdline):
     if isinstance(cmdline, list):
         cmdline = " ".join(cmdline)
     support_list = ("$LISTOPT" in cmdline)
-    if not "$LISTOPT" in cmdline:
+    if "$LISTOPT" not in cmdline:
         raise AssertionError("loadlist test %s does not support not --list" % name)
-    if not "$LOADLIST" in cmdline:
+    if "$LOADLIST" not in cmdline:
         raise AssertionError("loadlist test %s does not support --load-list" % name)
     print(("%s | %s" % (cmdline.replace("$LOADLIST", ""), add_prefix(name, env, support_list))).replace("$LISTOPT", "--list"))
     print(cmdline.replace("$LISTOPT", "") + " 2>&1 " + " | " + add_prefix(name, env, False))

diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py
index 830dd4ba63d0cdc062320fe223f02f1d601f05e4..d79bd7f2ba5a2c0a98d53974320cc20ffa652aae 100644 (file)
--- a/selftest/subunithelper.py
+++ b/selftest/subunithelper.py
@@ -601,7 +601,7 @@ class PlainFormatter(TestsuiteEnabledTestResult):
         out = ""
         unexpected = False
 
-        if not name in self.test_output:
+        if name not in self.test_output:
             print("no output for name[%s]" % name)
 
         if result in ("success", "xfail"):
@@ -655,7 +655,7 @@ class PlainFormatter(TestsuiteEnabledTestResult):
                     'success': '.'}.get(result, "?(%s)" % result))
             return
 
-        if not self.name in self.test_output:
+        if self.name not in self.test_output:
             self.test_output[self.name] = ""
 
         self.test_output[self.name] += "UNEXPECTED(%s): %s\n" % (result, testname)

diff --git a/source4/dsdb/tests/python/acl.py b/source4/dsdb/tests/python/acl.py
index 3251cb53fa62809862339fbb5827365f296baa52..aaa7995be977b5f03efb85f81b318be1aa524c86 100755 (executable)
--- a/source4/dsdb/tests/python/acl.py
+++ b/source4/dsdb/tests/python/acl.py
@@ -51,7 +51,7 @@ if len(args) < 1:
     sys.exit(1)
 
 host = args[0]
-if not "://" in host:
+if "://" not in host:
     ldaphost = "ldap://%s" % host
 else:
     ldaphost = host

diff --git a/source4/dsdb/tests/python/deletetest.py b/source4/dsdb/tests/python/deletetest.py
index af1274eb7f32153027be609d06fa92bf25d1357f..0597d4fe52bab80201ce0d1d82f45e73887cefef 100755 (executable)
--- a/source4/dsdb/tests/python/deletetest.py
+++ b/source4/dsdb/tests/python/deletetest.py
@@ -556,7 +556,7 @@ class BasicTreeDeleteTests(BasicDeleteTests):
         self.assertFalse("CN=Deleted Objects" in str(objDeleted7.dn))
 
 
-if not "://" in host:
+if "://" not in host:
     if os.path.isfile(host):
         host = "tdb://%s" % host
     else:

diff --git a/source4/dsdb/tests/python/dirsync.py b/source4/dsdb/tests/python/dirsync.py
index 474cd45f5658877cbff902cf812105e6cad9b974..d8cd3c67d083a55f463d54bac23648fcbc602534 100755 (executable)
--- a/source4/dsdb/tests/python/dirsync.py
+++ b/source4/dsdb/tests/python/dirsync.py
@@ -58,7 +58,7 @@ if len(args) < 1:
     sys.exit(1)
 
 host = args.pop()
-if not "://" in host:
+if "://" not in host:
     ldaphost = "ldap://%s" % host
     ldapshost = "ldaps://%s" % host
 else:

diff --git a/source4/dsdb/tests/python/ldap.py b/source4/dsdb/tests/python/ldap.py
index b2ef01b9420085fe4952f6be59361ea9cb944ceb..dac8aa0fd679b4d063b3faca029dd45a0c30e56b 100755 (executable)
--- a/source4/dsdb/tests/python/ldap.py
+++ b/source4/dsdb/tests/python/ldap.py
@@ -3271,14 +3271,14 @@ class BaseDnTests(samba.tests.TestCase):
         self.assertEquals(given, expected)
 
 
-if not "://" in host:
+if "://" not in host:
     if os.path.isfile(host):
         host = "tdb://%s" % host
     else:
         host = "ldap://%s" % host
 
 ldb = SamDB(host, credentials=creds, session_info=system_session(lp), lp=lp)
-if not "tdb://" in host:
+if "tdb://" not in host:
     gc_ldb = Ldb("%s:3268" % host, credentials=creds,
                  session_info=system_session(lp), lp=lp)
 else:

diff --git a/source4/dsdb/tests/python/ldap_schema.py b/source4/dsdb/tests/python/ldap_schema.py
index 9a4003ae612fb703bd9eafa445ba7524f8ecb243..716fd161895215eaa6ad12971d42cac4fcd7e27e 100755 (executable)
--- a/source4/dsdb/tests/python/ldap_schema.py
+++ b/source4/dsdb/tests/python/ldap_schema.py
@@ -1646,7 +1646,7 @@ class SchemaTests_msDS_isRODC(samba.tests.TestCase):
                 self.assertTrue("msDS-isRODC" in ldb_msg)
 
 
-if not "://" in host:
+if "://" not in host:
     if os.path.isfile(host):
         host = "tdb://%s" % host
     else:

diff --git a/source4/dsdb/tests/python/notification.py b/source4/dsdb/tests/python/notification.py
index bb3280aaece8a13b5d39e0d8b29a4a87be44f7ac..72f511faafc888396c4c1e6f1d6f5a5f5c3eae0b 100755 (executable)
--- a/source4/dsdb/tests/python/notification.py
+++ b/source4/dsdb/tests/python/notification.py
@@ -365,7 +365,7 @@ delete: otherLoginWorkstations
             self.assertEquals(num, ERR_UNWILLING_TO_PERFORM)
 
 
-if not "://" in url:
+if "://" not in url:
     if os.path.isfile(url):
         url = "tdb://%s" % url
     else:

diff --git a/source4/dsdb/tests/python/passwords.py b/source4/dsdb/tests/python/passwords.py
index 44b04943027ee304a2dcdcef1d11a43dec38f3cc..0f73cf31928d78104c95a974da55dbd022b53ce2 100755 (executable)
--- a/source4/dsdb/tests/python/passwords.py
+++ b/source4/dsdb/tests/python/passwords.py
@@ -1134,7 +1134,7 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS3\"".encode('utf-16-le')).
         self.ldb2 = None
 
 
-if not "://" in host:
+if "://" not in host:
     if os.path.isfile(host):
         host = "tdb://%s" % host
     else:

diff --git a/source4/dsdb/tests/python/sam.py b/source4/dsdb/tests/python/sam.py
index d45f5b802044ebeb6f3bd61fe48c6a7acc180b32..58d5edb7b1fa137b411315b06163d456b1323427 100755 (executable)
--- a/source4/dsdb/tests/python/sam.py
+++ b/source4/dsdb/tests/python/sam.py
@@ -3760,7 +3760,7 @@ class SamTests(samba.tests.TestCase):
         delete_force(self.ldb, "cn=ldaptestuser,cn=users," + self.base_dn)
 
 
-if not "://" in host:
+if "://" not in host:
     if os.path.isfile(host):
         host = "tdb://%s" % host
     else:

diff --git a/source4/dsdb/tests/python/sec_descriptor.py b/source4/dsdb/tests/python/sec_descriptor.py
index cea148fc88d7927ddd91fe156a781f4791882e76..2ce9caab572ee564404cff4fe01698f07ed51d72 100755 (executable)
--- a/source4/dsdb/tests/python/sec_descriptor.py
+++ b/source4/dsdb/tests/python/sec_descriptor.py
@@ -2146,7 +2146,7 @@ class SdAutoInheritTests(DescriptorTests):
         self.assertTrue(sub_usn2 == sub_usn0)
 
 
-if not "://" in host:
+if "://" not in host:
     if os.path.isfile(host):
         host = "tdb://%s" % host
     else:

diff --git a/source4/dsdb/tests/python/sites.py b/source4/dsdb/tests/python/sites.py
index 7dd48d07f97407f0f156317a1e3d1b9214cefbcb..6002397df83e510c9a871a1ef411ac59a8bf3729 100755 (executable)
--- a/source4/dsdb/tests/python/sites.py
+++ b/source4/dsdb/tests/python/sites.py
@@ -55,7 +55,7 @@ if len(args) < 1:
     sys.exit(1)
 
 host = args[0]
-if not "://" in host:
+if "://" not in host:
     ldaphost = "ldap://%s" % host
 else:
     ldaphost = host

diff --git a/source4/dsdb/tests/python/token_group.py b/source4/dsdb/tests/python/token_group.py
index 9769d2c03da00c2a787d4abb8208ccb08b45ab28..a69699ed169cad467e25b60c1851d1683005d668 100755 (executable)
--- a/source4/dsdb/tests/python/token_group.py
+++ b/source4/dsdb/tests/python/token_group.py
@@ -649,7 +649,7 @@ class DynamicTokenTest(samba.tests.TestCase):
         self.assertEqual(rids.rids[0].rid, user_info.primary_gid)
 
 
-if not "://" in url:
+if "://" not in url:
     if os.path.isfile(url):
         url = "tdb://%s" % url
     else:

diff --git a/source4/dsdb/tests/python/user_account_control.py b/source4/dsdb/tests/python/user_account_control.py
index 5fd8aaf6f388de9bc7019062661669936a56a93c..dd3276add9819c51be9f81f7b0caea912b3fc40d 100755 (executable)
--- a/source4/dsdb/tests/python/user_account_control.py
+++ b/source4/dsdb/tests/python/user_account_control.py
@@ -58,7 +58,7 @@ if len(args) < 1:
     sys.exit(1)
 host = args[0]
 
-if not "://" in host:
+if "://" not in host:
     ldaphost = "ldap://%s" % host
 else:
     ldaphost = host

diff --git a/source4/scripting/devel/pfm_verify.py b/source4/scripting/devel/pfm_verify.py
index 4d4e0c9536f71bd614ace0f4c309e9dd6595cfa2..c1e2f7ab6927ffec21f0adb7eaafa13c7c1f1fae 100755 (executable)
--- a/source4/scripting/devel/pfm_verify.py
+++ b/source4/scripting/devel/pfm_verify.py
@@ -163,7 +163,7 @@ if __name__ == "__main__":
 
     if len(args) != 1:
         import os
-        if not "DC_SERVER" in os.environ.keys():
+        if "DC_SERVER" not in os.environ.keys():
             parser.error("You must supply a server")
         args.append(os.environ["DC_SERVER"])
 

diff --git a/source4/scripting/devel/speedtest.py b/source4/scripting/devel/speedtest.py
index 969edb0819214215b9d5d45a6c3e70eb0b822491..e8d412436e63c865b2cd07014adc2fb65dbe2ba8 100755 (executable)
--- a/source4/scripting/devel/speedtest.py
+++ b/source4/scripting/devel/speedtest.py
@@ -227,7 +227,7 @@ class AclSearchSpeedTest(SpeedTest):
 # Important unit running information
 
 
-if not "://" in host:
+if "://" not in host:
     host = "ldap://%s" % host
 
 ldb_options = ["modules:paged_searches"]

diff --git a/source4/torture/drs/python/repl_rodc.py b/source4/torture/drs/python/repl_rodc.py
index bdc7041571f9238cbca3a7a267b41566dda2fefc..b9e3f827773dacc25b4caf88c662a12c44ef9eb9 100644 (file)
--- a/source4/torture/drs/python/repl_rodc.py
+++ b/source4/torture/drs/python/repl_rodc.py
@@ -73,7 +73,7 @@ def drs_get_rodc_partial_attribute_set(samdb, samdb1, exceptions=[]):
                 continue
         try:
             attid = samdb1.get_attid_from_lDAPDisplayName(ldap_display_name)
-            if not attid in exceptions:
+            if attid not in exceptions:
                 attids.append(int(attid))
         except:
             pass

diff --git a/source4/torture/libnet/python/samr-test.py b/source4/torture/libnet/python/samr-test.py
index 22b754fb6fb6695500684e15478201c32aa9b32e..82cf61d33b165c6c0e538b8fcd135b69a25ca389 100644 (file)
--- a/source4/torture/libnet/python/samr-test.py
+++ b/source4/torture/libnet/python/samr-test.py
@@ -31,10 +31,10 @@ import os
 from samba import net
 import samba.tests
 
-if not "ACCOUNT_NAME" in os.environ.keys():
+if "ACCOUNT_NAME" not in os.environ.keys():
     raise Exception("Please supply ACCOUNT_NAME in environment")
 
-if not "NEW_PASS" in os.environ.keys():
+if "NEW_PASS" not in os.environ.keys():
     raise Exception("Please supply NEW_PASS in environment")
 
 account_name = os.environ["ACCOUNT_NAME"]

diff --git a/wintest/wintest.py b/wintest/wintest.py
index 064eb4bac46b7d230234573d41d77d016471d0c9..166489aa0376b3566ad53d83b3cd1d65f4db864d 100644 (file)
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -49,7 +49,7 @@ class wintest():
 
     def getvar(self, varname):
         '''return a substitution variable'''
-        if not varname in self.vars:
+        if varname not in self.vars:
             return None
         return self.vars[varname]
 
@@ -133,7 +133,7 @@ class wintest():
             if var_end == -1:
                 return text
             var_name = text[var_start + 2:var_end]
-            if not var_name in self.vars:
+            if var_name not in self.vars:
                 raise RuntimeError("Unknown substitution variable ${%s}" % var_name)
             text = text.replace("${%s}" % var_name, self.vars[var_name])
         return text