SCons: replace usage of has_key

Tested with SCons 4.3.0.

Author: merlinND

src/converter/SConscript

@@ -12,11 +12,11 @@ if hasCollada:
         # Build the COLLADA importer if COLLADA-DOM is vailable
         colladaEnv.Append(LIBS=['mitsuba-hw'])
         colladaEnv.Append(LIBPATH=['#src/libhw'])
-        if colladaEnv.has_key('COLLADAINCLUDE'):
+        if 'COLLADAINCLUDE' in colladaEnv:
                 colladaEnv.Prepend(CPPPATH=colladaEnv['COLLADAINCLUDE'])
-        if colladaEnv.has_key('COLLADALIBDIR'):
+        if 'COLLADALIBDIR' in colladaEnv:
                 colladaEnv.Prepend(LIBPATH=colladaEnv['COLLADALIBDIR'])
-        if colladaEnv.has_key('COLLADALIB'):
+        if 'COLLADALIB' in colladaEnv:
                 colladaEnv.Prepend(LIBS=colladaEnv['COLLADALIB'])
         converter_objects += [
                 colladaEnv.StaticObject('collada.cpp'),

src/films/SConscript

@@ -1,13 +1,13 @@
 Import('env', 'plugins')
 
 filmEnv = env.Clone()
-if filmEnv.has_key('OEXRLIBDIR'):
+if 'OEXRLIBDIR' in filmEnv:
         filmEnv.Prepend(LIBPATH=env['OEXRLIBDIR'])
-if filmEnv.has_key('OEXRINCLUDE'):
+if 'OEXRINCLUDE' in filmEnv:
         filmEnv.Prepend(CPPPATH=env['OEXRINCLUDE'])
-if filmEnv.has_key('OEXRFLAGS'):
+if 'OEXRFLAGS' in filmEnv:
         filmEnv.Prepend(CPPFLAGS=env['OEXRFLAGS'])
-if filmEnv.has_key('OEXRLIB'):
+if 'OEXRLIB' in filmEnv:
         filmEnv.Prepend(LIBS=env['OEXRLIB'])
 
 plugins += filmEnv.SharedLibrary('mfilm', ['mfilm.cpp', 'cnpy.cpp'])

src/libcore/SConscript

@@ -2,31 +2,31 @@ Import('env', 'sys', 'os')
 
 # Core library environment with OpenEXR, libpng and libjpeg
 coreEnv = env.Clone()
-if coreEnv.has_key('OEXRLIBDIR'):
+if 'OEXRLIBDIR' in coreEnv:
         coreEnv.Prepend(LIBPATH=env['OEXRLIBDIR'])
-if coreEnv.has_key('OEXRINCLUDE'):
+if 'OEXRINCLUDE' in coreEnv:
         coreEnv.Prepend(CPPPATH=env['OEXRINCLUDE'])
-if coreEnv.has_key('OEXRFLAGS'):
+if 'OEXRFLAGS' in coreEnv:
         coreEnv.Prepend(CPPFLAGS=env['OEXRFLAGS'])
-if coreEnv.has_key('OEXRLIB'):
+if 'OEXRLIB' in coreEnv:
         coreEnv.Prepend(LIBS=env['OEXRLIB'])
-if coreEnv.has_key('PNGLIBDIR'):
+if 'PNGLIBDIR' in coreEnv:
         coreEnv.Prepend(LIBPATH=env['PNGLIBDIR'])
-if coreEnv.has_key('PNGINCLUDE'):
+if 'PNGINCLUDE' in coreEnv:
         coreEnv.Prepend(CPPPATH=env['PNGINCLUDE'])
-if coreEnv.has_key('PNGLIB'):
+if 'PNGLIB' in coreEnv:
         coreEnv.Prepend(LIBS=env['PNGLIB'])
-if coreEnv.has_key('JPEGLIBDIR'):
+if 'JPEGLIBDIR' in coreEnv:
         coreEnv.Prepend(LIBPATH=env['JPEGLIBDIR'])
-if coreEnv.has_key('JPEGINCLUDE'):
+if 'JPEGINCLUDE' in coreEnv:
         coreEnv.Prepend(CPPPATH=env['JPEGINCLUDE'])
-if coreEnv.has_key('JPEGLIB'):
+if 'JPEGLIB' in coreEnv:
         coreEnv.Prepend(LIBS=env['JPEGLIB'])
-if coreEnv.has_key('FFTWLIBDIR'):
+if 'FFTWLIBDIR' in coreEnv:
         coreEnv.Prepend(LIBPATH=env['FFTWLIBDIR'])
-if coreEnv.has_key('FFTWINCLUDE'):
+if 'FFTWINCLUDE' in coreEnv:
         coreEnv.Prepend(CPPPATH=env['FFTWINCLUDE'])
-if coreEnv.has_key('FFTWLIB'):
+if 'FFTWLIB' in coreEnv:
         coreEnv.Prepend(LIBS=env['FFTWLIB'])
 
 coreEnv.Prepend(CPPDEFINES = [['MTS_BUILD_MODULE', 'MTS_MODULE_CORE']])

src/libhw/SConscript

@@ -18,13 +18,13 @@ elif 'linux' in sys.platform:
 
 glEnv = env.Clone()
 glEnv.Append(CPPDEFINES = [['MTS_BUILD_MODULE', 'MTS_MODULE_HW']] )
-if glEnv.has_key('GLLIB'):
+if 'GLLIB' in glEnv:
         glEnv.Prepend(LIBS=glEnv['GLLIB'])
-if glEnv.has_key('GLLIBDIR'):
+if 'GLLIBDIR' in glEnv:
         glEnv.Prepend(LIBPATH=glEnv['GLLIBDIR'])
-if glEnv.has_key('GLFLAGS'):
+if 'GLFLAGS' in glEnv:
         glEnv.Prepend(CPPFLAGS=glEnv['GLFLAGS'])
-if glEnv.has_key('GLINCLUDE'):
+if 'GLINCLUDE' in glEnv:
         glEnv.Prepend(CPPPATH=glEnv['GLINCLUDE'])
 
 if sys.platform == 'darwin':

src/libpython/SConscript

@@ -2,9 +2,9 @@ Import('env', 'sys', 'os', 'hasPython')
 
 for ver in hasPython:
         sver = ver.replace('.', '')
-        python_include = list(env['PYTHON'+sver+'INCLUDE']) if env.has_key('PYTHON'+sver+'INCLUDE') else []
-        python_libdir = list(env['PYTHON'+sver+'LIBDIR']) if env.has_key('PYTHON'+sver+'LIBDIR') else []
-        python_lib = list(env['PYTHON'+sver+'LIB']) if env.has_key('PYTHON'+sver+'LIB') else []
+        python_include = list(env['PYTHON'+sver+'INCLUDE']) if ('PYTHON'+sver+'INCLUDE') in env else []
+        python_libdir = list(env['PYTHON'+sver+'LIBDIR']) if ('PYTHON'+sver+'LIBDIR') in env else []
+        python_lib = list(env['PYTHON'+sver+'LIB']) if ('PYTHON'+sver+'LIB') in env else []
 
         if 'linux' in sys.platform:
                 # On Linux, don't link to the core Python library. The associated symbols will be resolved
@@ -23,11 +23,11 @@ for ver in hasPython:
         pythonEnv.Append(LIBS=['mitsuba-bidir'])
         pythonEnv.Append(LIBPATH=['#src/libbidir'])
 
-        if pythonEnv.has_key('XERCESINCLUDE'):
+        if 'XERCESINCLUDE' in pythonEnv:
                 pythonEnv.Prepend(CPPPATH=pythonEnv['XERCESINCLUDE'])
-        if pythonEnv.has_key('XERCESLIBDIR'):
+        if 'XERCESLIBDIR' in pythonEnv:
                 pythonEnv.Prepend(LIBPATH=pythonEnv['XERCESLIBDIR'])
-        if pythonEnv.has_key('XERCESLIB'):
+        if 'XERCESLIB' in pythonEnv:
                 pythonEnv.Prepend(LIBS=pythonEnv['XERCESLIB'])
 
         if sys.platform != 'win32':

src/librender/SConscript

@@ -2,11 +2,11 @@ Import('env', 'sys', 'os')
 
 renderEnv = env.Clone()
 renderEnv.Append(CPPDEFINES = [['MTS_BUILD_MODULE', 'MTS_MODULE_RENDER']] )
-if renderEnv.has_key('XERCESINCLUDE'):
+if 'XERCESINCLUDE' in renderEnv:
         renderEnv.Prepend(CPPPATH=renderEnv['XERCESINCLUDE'])
-if renderEnv.has_key('XERCESLIBDIR'):
+if 'XERCESLIBDIR' in renderEnv:
         renderEnv.Prepend(LIBPATH=renderEnv['XERCESLIBDIR'])
-if renderEnv.has_key('XERCESLIB'):
+if 'XERCESLIB' in renderEnv:
         renderEnv.Prepend(LIBS=renderEnv['XERCESLIB'])
 
 librender = renderEnv.SharedLibrary('mitsuba-render', [

src/mitsuba/SConscript

@@ -2,19 +2,19 @@ Import('sys', 'env', 'hasCollada', 'stubs', 'winstubs')
 
 # Create an environment with Xerces and OpenGL
 mainEnv = env.Clone()
-if mainEnv.has_key('XERCESINCLUDE'):
+if 'XERCESINCLUDE' in mainEnv:
         mainEnv.Prepend(CPPPATH=mainEnv['XERCESINCLUDE'])
-if mainEnv.has_key('XERCESLIBDIR'):
+if 'XERCESLIBDIR' in mainEnv:
         mainEnv.Prepend(LIBPATH=mainEnv['XERCESLIBDIR'])
-if mainEnv.has_key('XERCESLIB'):
+if 'XERCESLIB' in mainEnv:
         mainEnv.Prepend(LIBS=mainEnv['XERCESLIB'])
-if mainEnv.has_key('GLLIB'):
+if 'GLLIB' in mainEnv:
         mainEnv.Prepend(LIBS=mainEnv['GLLIB'])
-if mainEnv.has_key('GLLIBDIR'):
+if 'GLLIBDIR' in mainEnv:
         mainEnv.Prepend(LIBPATH=mainEnv['GLLIBDIR'])
-if mainEnv.has_key('GLFLAGS'):
+if 'GLFLAGS' in mainEnv:
         mainEnv.Prepend(CXXFLAGS=mainEnv['GLFLAGS'])
-if mainEnv.has_key('GLINCLUDE'):
+if 'GLINCLUDE' in mainEnv:
         mainEnv.Prepend(CPPPATH=mainEnv['GLINCLUDE'])
 
 if sys.platform == 'darwin':