[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57688] trunk/blender/build_files: replace use of 'a.find(b) != -1' --> 'b in a'

Campbell Barton ideasman42 at gmail.com
Mon Jun 24 07:55:05 CEST 2013


Revision: 57688
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57688
Author:   campbellbarton
Date:     2013-06-24 05:55:05 +0000 (Mon, 24 Jun 2013)
Log Message:
-----------
replace use of 'a.find(b) != -1' --> 'b in a'

Modified Paths:
--------------
    trunk/blender/build_files/buildbot/slave_test.py
    trunk/blender/build_files/scons/config/win32-vc-config.py
    trunk/blender/build_files/scons/config/win64-vc-config.py
    trunk/blender/build_files/scons/tools/Blender.py
    trunk/blender/build_files/scons/tools/btools.py

Modified: trunk/blender/build_files/buildbot/slave_test.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_test.py	2013-06-24 05:45:03 UTC (rev 57687)
+++ trunk/blender/build_files/buildbot/slave_test.py	2013-06-24 05:55:05 UTC (rev 57688)
@@ -31,7 +31,7 @@
 # we run from build/ directory
 blender_dir = '../blender'
 
-if builder.find('cmake') != -1:
+if "cmake" in builder:
     # cmake
     retcode = subprocess.call(['ctest', '.' '--output-on-failure'])
     sys.exit(retcode)

Modified: trunk/blender/build_files/scons/config/win32-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win32-vc-config.py	2013-06-24 05:45:03 UTC (rev 57687)
+++ trunk/blender/build_files/scons/config/win32-vc-config.py	2013-06-24 05:55:05 UTC (rev 57688)
@@ -3,13 +3,12 @@
 CL_OUT = subprocess.Popen(["cl.exe"],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
 CL_STDOUT, CL_STDERR = CL_OUT.communicate()
 
-if CL_STDERR.find("17.00.") == -1:
-    VC_VERSION = '9.0'
-    LCGDIR = '#../lib/windows'
-    
-else:
+if "17.00." in CL_STDERR:
     VC_VERSION = '11.0'
     LCGDIR = '#../lib/windows_vc11'
+else:
+    VC_VERSION = '9.0'
+    LCGDIR = '#../lib/windows'
 
 LIBDIR = '${LCGDIR}'
 

Modified: trunk/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- trunk/blender/build_files/scons/config/win64-vc-config.py	2013-06-24 05:45:03 UTC (rev 57687)
+++ trunk/blender/build_files/scons/config/win64-vc-config.py	2013-06-24 05:55:05 UTC (rev 57688)
@@ -3,13 +3,12 @@
 CL_OUT = subprocess.Popen(["cl.exe"],stdout=subprocess.PIPE,stderr=subprocess.PIPE)
 CL_STDOUT, CL_STDERR = CL_OUT.communicate()
 
-if CL_STDERR.find("17.00.") == -1:
-    VC_VERSION = '9.0'
-    LCGDIR = '#../lib/win64'
-    
-else:
+if "17.00." in CL_STDERR:
     VC_VERSION = '11.0'
     LCGDIR = '#../lib/win64_vc11'
+else:
+    VC_VERSION = '9.0'
+    LCGDIR = '#../lib/win64'
 
 LIBDIR = '${LCGDIR}'
 

Modified: trunk/blender/build_files/scons/tools/Blender.py
===================================================================
--- trunk/blender/build_files/scons/tools/Blender.py	2013-06-24 05:45:03 UTC (rev 57687)
+++ trunk/blender/build_files/scons/tools/Blender.py	2013-06-24 05:55:05 UTC (rev 57688)
@@ -847,7 +847,7 @@
 
         def list_substring(quickie, libname):
             for q in quickie:
-                if libname.find(q) != -1:
+                if q in libname:
                     return True
             return False
 

Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py	2013-06-24 05:45:03 UTC (rev 57687)
+++ trunk/blender/build_files/scons/tools/btools.py	2013-06-24 05:55:05 UTC (rev 57688)
@@ -674,10 +674,10 @@
     if platform == 'linux':
         import platform
 
-        if env['BF_INSTALLDIR'].find('glibc27') != -1:
-            glibc="glibc27"
-        elif env['BF_INSTALLDIR'].find('glibc211') != -1:
-            glibc="glibc211"
+        if "glibc27" in env['BF_INSTALLDIR']:
+            glibc = "glibc27"
+        elif "glibc211" in env['BF_INSTALLDIR']:
+            glibc = "glibc211"
 
         bitness = platform.architecture()[0]
         if bitness == '64bit':




More information about the Bf-blender-cvs mailing list