From 48d102ffa7ee08a49e68f9ff794e92a344c257f0 Mon Sep 17 00:00:00 2001
From: Radim Kolar <hsn@sendmail.cz>
Date: Fri, 16 Aug 2019 13:52:24 +0200
Subject: [PATCH] sync site_scons with fspclient

---
 site_scons/clangtest.py   | 12 ++++++------
 site_scons/gzipBuilder.py | 10 +++++-----
 site_scons/importer.py    | 18 +++++++++---------
 site_scons/maintainer.py  |  6 +++---
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/site_scons/clangtest.py b/site_scons/clangtest.py
index 06e14e5..4155d2e 100644
--- a/site_scons/clangtest.py
+++ b/site_scons/clangtest.py
@@ -1,8 +1,8 @@
 #
 # SCons C language related tests
 #
-# Version 1.2
-# 24-Aug-2009
+# Version 1.3
+# 16-Aug-2019
 #
 
 def checkForVariable(conf,variable,include):
@@ -34,16 +34,16 @@ main ()
 }
 """ % (var,var),'.c')
     if rc:
-	rc,result = conf.TryRun('''
+        rc,result = conf.TryRun('''
 #include <stdio.h>
-#include <sys/types.h>	
+#include <sys/types.h>  
 
 main ()
 {
     printf("%%d",sizeof(%s));
     return 0;
 }''' % var,'.c')
-	if rc:
-	    rc=result
+        if rc:
+            rc=result
     conf.Result(rc)
     return rc
diff --git a/site_scons/gzipBuilder.py b/site_scons/gzipBuilder.py
index 62051a0..c01b474 100644
--- a/site_scons/gzipBuilder.py
+++ b/site_scons/gzipBuilder.py
@@ -1,8 +1,8 @@
 #
 # GZip SCons builder
 #
-# Version 1.0
-# 16-Jun-2009
+# Version 1.1
+# 16-Aug-2019
 #
 
 def GZip(target, source, env=None):
@@ -19,14 +19,14 @@ def GZip(target, source, env=None):
    """
    import gzip
    if not isinstance(target, list):
-       raise TypeError,"target must be list"
+       raise TypeError("target must be list")
    elif not isinstance(source, list):
-       raise TypeError,"source must be list"
+       raise TypeError("source must be list")
    for i in range(0,len(target)):
        inpf=str(source[i])
        outf=str(target[i])
        out=gzip.open(outf,"wb")
-       inp=file(inpf,"rb")
+       inp=open(inpf,"rb")
        out.write(inp.read())
        out.close()
        inp.close()
diff --git a/site_scons/importer.py b/site_scons/importer.py
index 4d989fe..7b6666d 100644
--- a/site_scons/importer.py
+++ b/site_scons/importer.py
@@ -1,8 +1,8 @@
 #
 # Scons variable importer
 #
-# Version 1.0
-# 16-Jun-2009
+# Version 1.1
+# 16-Aug-2019
 #
 import os
 
@@ -73,23 +73,23 @@ def _importcore(env,varlist,targets,prefix,setter):
            if isinstance(varlist, str):
                varlist=[varlist]
            else:
-               raise TypeError,"varlist must be list or string"
+               raise TypeError("varlist must be list or string")
        if targets:
            if not isinstance(targets, list):
                if isinstance(targets, str):
                    targets=[targets]
                else:
-                   raise TypeError,"targets must be list of string"
+                   raise TypeError("targets must be list of string")
        for i in range(0,len(varlist)):
            value=os.environ.get(varlist[i])
-	   if value:
+           if value:
                if targets:
-	          setter(*[env,targets[i],value])
+                  setter(*[env,targets[i],value])
                else:   
-	          setter(*[env,varlist[i],value])
+                  setter(*[env,varlist[i],value])
    if prefix:
        if not isinstance(prefix, str):
-           raise TypeError,"prefix must be string"
+           raise TypeError("prefix must be string")
        for i in os.environ.keys():
-	   if i.startswith(prefix):
+           if i.startswith(prefix):
                setter(*[env,i,os.environ.get(i)])
diff --git a/site_scons/maintainer.py b/site_scons/maintainer.py
index 75a8974..c92abeb 100644
--- a/site_scons/maintainer.py
+++ b/site_scons/maintainer.py
@@ -1,8 +1,8 @@
 #
 # SCons check for maintainer mode
 #
-# Version 1.4
-# 15-Aug-2019
+# Version 1.5
+# 16-Aug-2019
 #
 
 from SCons.Script import ARGUMENTS
@@ -17,7 +17,7 @@ def checkForMaintainerMode(conf,force=False):
     try:
          maint2=int(maint)
     except ValueError:
-         maint2=None
+         maint2=0
     if force: maint2 = 1
     if maint2 > 0 or str(maint).lower() == 'yes':
                           conf.Result(1)