SConstruct: open() in text mode. Fixed octal literals.

1 files changed, 12 insertions, 12 deletions

diff --git a/SConstruct b/SConstruct
index 1a0aef0..09eb739 100644
--- a/SConstruct
+++ b/SConstruct
@@ -70,7 +70,7 @@ def whereis(file):
                     st = os.stat(f_ext)
                 except:
                     continue
-                if stat.S_IMODE(st[stat.ST_MODE]) & 0111:
+                if stat.S_IMODE(st[stat.ST_MODE]) & 0o111:
                     return f_ext
     return None
 
@@ -372,7 +372,7 @@ def SCons_revision(target, source, env):
     """
     t = str(target[0])
     s = source[0].rstr()
-    contents = open(s, 'rb').read()
+    contents = open(s, 'r').read()
     # Note:  We construct the __*__ substitution strings here
     # so that they don't get replaced when this file gets
     # copied into the tree for packaging.
@@ -386,7 +386,7 @@ def SCons_revision(target, source, env):
     contents = contents.replace('__REVISION'  + '__', env['REVISION'])
     contents = contents.replace('__VERSION'   + '__', env['VERSION'])
     contents = contents.replace('__NULL'      + '__', '')
-    open(t, 'wb').write(contents)
+    open(t, 'w').write(contents)
     os.chmod(t, os.stat(s)[0])
 
 revaction = SCons_revision
@@ -851,7 +851,7 @@ for p in [ scons ]:
 
     dist_distutils_targets = env.Install('$DISTDIR', distutils_targets)
     Local(dist_distutils_targets)
-    AddPostAction(dist_distutils_targets, Chmod(dist_distutils_targets, 0644))
+    AddPostAction(dist_distutils_targets, Chmod(dist_distutils_targets, 0o644))
 
     if not gzip:
         print("gzip not found in %s; skipping .tar.gz package for %s." % (os.environ['PATH'], pkg))
@@ -866,8 +866,8 @@ for p in [ scons ]:
         dist_tar_gz             = env.Install('$DISTDIR', tar_gz)
         dist_platform_tar_gz    = env.Install('$DISTDIR', platform_tar_gz)
         Local(dist_tar_gz, dist_platform_tar_gz)
-        AddPostAction(dist_tar_gz, Chmod(dist_tar_gz, 0644))
-        AddPostAction(dist_platform_tar_gz, Chmod(dist_platform_tar_gz, 0644))
+        AddPostAction(dist_tar_gz, Chmod(dist_tar_gz, 0o644))
+        AddPostAction(dist_platform_tar_gz, Chmod(dist_platform_tar_gz, 0o644))
 
         #
         # Unpack the tar.gz archive created by the distutils into
@@ -941,8 +941,8 @@ for p in [ scons ]:
         dist_zip            = env.Install('$DISTDIR', zip)
         dist_platform_zip   = env.Install('$DISTDIR', platform_zip)
         Local(dist_zip, dist_platform_zip)
-        AddPostAction(dist_zip, Chmod(dist_zip, 0644))
-        AddPostAction(dist_platform_zip, Chmod(dist_platform_zip, 0644))
+        AddPostAction(dist_zip, Chmod(dist_zip, 0o644))
+        AddPostAction(dist_platform_zip, Chmod(dist_platform_zip, 0o644))
 
         #
         # Unpack the zip archive created by the distutils into
@@ -1029,8 +1029,8 @@ for p in [ scons ]:
         dist_noarch_rpm = env.Install('$DISTDIR', noarch_rpm)
         dist_src_rpm    = env.Install('$DISTDIR', src_rpm)
         Local(dist_noarch_rpm, dist_src_rpm)
-        AddPostAction(dist_noarch_rpm, Chmod(dist_noarch_rpm, 0644))
-        AddPostAction(dist_src_rpm, Chmod(dist_src_rpm, 0644))
+        AddPostAction(dist_noarch_rpm, Chmod(dist_noarch_rpm, 0o644))
+        AddPostAction(dist_src_rpm, Chmod(dist_src_rpm, 0o644))
 
         dfiles = [os.path.join(test_rpm_dir, 'usr', x) for x in dst_files]
         env.Command(dfiles,
@@ -1097,8 +1097,8 @@ for p in [ scons ]:
 
     dist_local_tar_gz = os.path.join("$DISTDIR/%s.tar.gz" % s_l_v)
     dist_local_zip = os.path.join("$DISTDIR/%s.zip" % s_l_v)
-    AddPostAction(dist_local_tar_gz, Chmod(dist_local_tar_gz, 0644))
-    AddPostAction(dist_local_zip, Chmod(dist_local_zip, 0644))
+    AddPostAction(dist_local_tar_gz, Chmod(dist_local_tar_gz, 0o644))
+    AddPostAction(dist_local_zip, Chmod(dist_local_zip, 0o644))
 
     commands = [
         Delete(build_dir_local),