Use "in" and "not in" instead of find()

A maintenance edit: most instances of str.find() used for membership
checks like "if foo.find('bar') != -1" are replaced with "in" or "not in",
or in a few cases, with the "startswith()" method.  The vendored docbook
utilities were not changed in this round though they had a couple of these.

Signed-off-by: Mats Wichmann <mats@linux.com>

Author: mwichmann

CHANGES.txt

@@ -30,6 +30,8 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - In the SequenceTypes tuple used for dynamic type checks, include
       the dict contents views, exclude the dictionary view itself as it
       is not an interable sequence type.
+    - Internal: where the find method on a string was used to determine
+      if a substring is present, use the more readable "in" and "not in".
 
 
 RELEASE 4.10.0 -  Thu, 02 Oct 2025 11:40:20 -0700

RELEASE.txt

@@ -52,6 +52,9 @@ IMPROVEMENTS
   documentation:  performance improvements (describe the circumstances
   under which they would be observed), or major code cleanups
 
+- Internal: where the find method on a string was used to determine
+  if a substring is present, use the more readable "in" and "not in".
+
 PACKAGING
 ---------
 

SCons/ActionTests.py

@@ -312,7 +312,7 @@ def none(a) -> None:
         except SCons.Errors.UserError as e:
             s = str(e)
             m = 'Invalid command display variable'
-            assert s.find(m) != -1, 'Unexpected string:  %s' % s
+            assert m in s, f'Unexpected string: {s}'
         else:
             raise Exception("did not catch expected UserError")
 
@@ -540,7 +540,7 @@ def func() -> None:
         except SCons.Errors.UserError as e:
             s = str(e)
             m = 'Cannot have both strfunction and cmdstr args to Action()'
-            assert s.find(m) != -1, 'Unexpected string:  %s' % s
+            assert m in s, f'Unexpected string: {s}'
         else:
             raise Exception("did not catch expected UserError")
 

SCons/Platform/__init__.py

@@ -74,15 +74,15 @@ def platform_default():
     if osname == 'posix':
         if sys.platform == 'cygwin':
             return 'cygwin'
-        elif sys.platform.find('irix') != -1:
+        elif 'irix' in sys.platform:
             return 'irix'
-        elif sys.platform.find('sunos') != -1:
+        elif 'sunos' in sys.platform:
             return 'sunos'
-        elif sys.platform.find('hp-ux') != -1:
+        elif 'hp-ux' in sys.platform:
             return 'hpux'
-        elif sys.platform.find('aix') != -1:
+        elif 'aix' in sys.platform:
             return 'aix'
-        elif sys.platform.find('darwin') != -1:
+        elif 'darwin' in sys.platform:
             return 'darwin'
         else:
             return 'posix'

SCons/Platform/win32.py

@@ -136,10 +136,10 @@ def piped_spawn(sh, escape, cmd, args, env, stdout, stderr):
     stderrRedirected = False
     for arg in args:
         # are there more possibilities to redirect stdout ?
-        if arg.find(">", 0, 1) != -1 or arg.find("1>", 0, 2) != -1:
+        if arg.startswith(">")or arg.startswith("1>"):
             stdoutRedirected = True
         # are there more possibilities to redirect stderr ?
-        if arg.find("2>", 0, 2) != -1:
+        if arg.startswith("2>"):
             stderrRedirected = True
 
     # redirect output of non-redirected streams to our tempfiles

SCons/Script/Main.py

@@ -144,7 +144,7 @@ def __init__(self, obj, interval: int=1, file=None, overwrite: bool=False) -> No
             self.func = obj
         elif SCons.Util.is_List(obj):
             self.func = self.spinner
-        elif obj.find(self.target_string) != -1:
+        elif self.target_string in obj:
             self.func = self.replace_string
         else:
             self.func = self.string
@@ -644,7 +644,7 @@ def find_deepest_user_frame(tb):
     # of SCons:
     for frame in tb:
         filename = frame[0]
-        if filename.find(os.sep+'SCons'+os.sep) == -1:
+        if f'{os.sep}SCons{os.sep}' not in filename:
             return frame
     return tb[0]
 

SCons/Subst.py

@@ -561,8 +561,8 @@ def expand(self, s, lvars, within_list):
                 self.close_strip('$)')
             else:
                 key = s[1:]
-                if key[0] == '{' or key.find('.') >= 0:
-                    if key[0] == '{':
+                if key.startswith('{') or '.' in key:
+                    if key.startswith('{'):
                         key = key[1:-1]
 
                 # Store for error messages if we fail to expand the
@@ -962,7 +962,7 @@ def scons_subst_once(strSubst, env, key):
 
     We do this with some straightforward, brute-force code here...
     """
-    if isinstance(strSubst, str) and strSubst.find('$') < 0:
+    if isinstance(strSubst, str) and '$' not in strSubst:
         return strSubst
 
     matchlist = ['$' + key, '${' + key + '}']

SCons/Tool/hpcxx.py

@@ -1,15 +1,6 @@
-"""SCons.Tool.hpc++
-
-Tool-specific initialization for c++ on HP/UX.
-
-There normally shouldn't be any need to import this module directly.
-It will usually be imported through the generic SCons.Tool.Tool()
-selection method.
-
-"""
-
+# MIT License
 #
-# __COPYRIGHT__
+# Copyright The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -29,9 +20,15 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
 
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+"""SCons.Tool.hpc++
+
+Tool-specific initialization for c++ on HP/UX.
+
+There normally shouldn't be any need to import this module directly.
+It will usually be imported through the generic SCons.Tool.Tool()
+selection method.
+"""
 
 import os.path
 
@@ -59,7 +56,7 @@
         acc = cc
         break
 
-        
+
 def generate(env) -> None:
     """Add Builders and construction variables for g++ to an Environment."""
     cplusplus.generate(env)
@@ -70,7 +67,7 @@ def generate(env) -> None:
         # determine version of aCC
         with os.popen(acc + ' -V 2>&1') as p:
             line = p.readline().rstrip()
-        if line.find('aCC: HP ANSI C++') == 0:
+        if line.startswith('aCC: HP ANSI C++'):
             env['CXXVERSION'] = line.split()[-1]
 
         if env['PLATFORM'] == 'cygwin':

SCons/Tool/intelc.py

@@ -569,7 +569,7 @@ class ICLTopDirWarning(SCons.Warnings.SConsWarning):
         for ld in [envlicdir, reglicdir]:
             # If the string contains an '@', then assume it's a network
             # license (port@system) and good by definition.
-            if ld and (ld.find('@') != -1 or os.path.exists(ld)):
+            if ld and ('@' in ld or os.path.exists(ld)):
                 licdir = ld
                 break
         if not licdir:

SCons/Tool/midl.py

@@ -52,10 +52,10 @@ def midl_emitter(target, source, env):
 
     midlcom = env['MIDLCOM']
 
-    if midlcom.find('/proxy') != -1:
+    if '/proxy' in midlcom:
         proxy = base + '_p.c'
         targets.append(proxy)
-    if midlcom.find('/dlldata') != -1:
+    if '/dlldata' in midlcom:
         dlldata = base + '_data.c'
         targets.append(dlldata)