Commits

William Deegan committed 6c6f865

Changes to setup.py to allow it to be parsed by python3.x. This allows it to get far enough that it can check the python version and issue a sensible error message if running under unsupported python3 or above

  • Participants
  • Parent commits a90f3d8

Comments (0)

Files changed (1)

     'scons-time.1',
 ]
 
+# Exit with error if trying to install with Python >= 3.0
+if sys.version_info >= (3,0,0):
+    msg = "scons: *** SCons does not run under Python version %s.\n\
+Python 3 and above are not yet supported.\n"
+    sys.stderr.write(msg % (sys.version.split()[0]))
+    sys.exit(1)
+
+
 # change to setup.py directory if it was executed from other dir
 (head, tail) = os.path.split(sys.argv[0])
 if head:
                     # log.info("changing mode of %s", file)
                     pass
                 else:
-                    mode = ((os.stat(file)[stat.ST_MODE]) | 0555) & 07777
+                    exec_and_read_permission = stat.S_IXOTH | stat.S_IXUSR | stat.S_IXGRP | stat.S_IROTH | stat.S_IRUSR | stat.S_IRGRP
+                    mode_mask = 4095 # Octal 07777 used because python3 has different octal syntax than python 2
+                    mode = ((os.stat(file)[stat.ST_MODE]) | exec_and_read_permission) & mode_mask
                     # log.info("changing mode of %s to %o", file, mode)
                     os.chmod(file, mode)
         # --- /distutils copy/paste ---
 distutils.core.setup(**arguments)
 
 if Installed:
-    print '\n'.join(Installed)
+    for i in Installed:
+        print(i)
 
 # Local Variables:
 # tab-width:4