Merge branch 'master' of https://sdal.tech/gitea/noselasd/libucore into cmake

SConstruct

@@ -11,7 +11,7 @@ version_info =  {
     'version_revision': revision,
 #version_abi is the abi version of the shared library. Only bump it when
 #backwards compatibility breaks. Strive to not break the ABI.
-    'version_abi':    '1.0.0' 
+    'version_abi':    '1.0.0'
 }
 version_info['version_str'] = "%d.%d.%d.%s" % (
     version_info['version_major'],
@@ -20,7 +20,7 @@ version_info['version_str'] = "%d.%d.%d.%s" % (
     version_info['version_revision'])
 
 
-AddOption('--build_type', 
+AddOption('--build_type',
             dest = 'build_type',
             type = 'choice',
             nargs = 1,
@@ -87,7 +87,7 @@ test_xml = GetOption('test_xml')
 prefix = GetOption('prefix')
 lib_suffix = ''
 if not (build_type in ['debug', 'release']):
-    print "Error: expected 'debug' or 'release', found: " + build_type
+    print("Error: expected 'debug' or 'release', found: " + build_type)
     Exit(1)
 
 def InstallPerm(env, dest, files, perm):
@@ -100,7 +100,7 @@ def InstallPerm(env, dest, files, perm):
 env = Environment(tools = ['default', 'textfile', 'packaging'])
 
 #allow shell environment to override compiler
-if os.environ.has_key('CC'):
+if os.environ.get('CC'):
     env['CC'] = os.environ['CC']
 
 env.AddMethod(InstallPerm)