New upstream version 3.0.0upstream/3.0.0

1 files changed, 18 insertions, 17 deletions

diff --git a/bin/update-release-info.py b/bin/update-release-info.py
index aee481e..a4096d1 100644
--- a/bin/update-release-info.py
+++ b/bin/update-release-info.py
@@ -36,7 +36,7 @@ In 'post' mode, files are prepared for the next release cycle:
     src/Announce.txt.
 """
 #
-# Copyright (c) 2001 - 2016 The SCons Foundation
+# Copyright (c) 2001 - 2017 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -56,8 +56,9 @@ In 'post' mode, files are prepared for the next release cycle:
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+from __future__ import print_function
 
-__revision__ = "bin/update-release-info.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog"
+__revision__ = "bin/update-release-info.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog"
 
 import os
 import sys
@@ -73,14 +74,14 @@ if len(sys.argv) < 2:
 else:
     mode = sys.argv[1]
     if mode not in ['develop', 'release', 'post']:
-        print("""ERROR: `%s' as a parameter is invalid; it must be one of
-\tdevelop, release, or post.  The default is develop.""" % mode)
+        print(("""ERROR: `%s' as a parameter is invalid; it must be one of
+\tdevelop, release, or post.  The default is develop.""" % mode))
         sys.exit(1)
 
 # Get configuration information
 
 config = dict()
-exec open('ReleaseConfig').read() in globals(), config
+exec(open('ReleaseConfig').read(), globals(), config)
 
 try:
     version_tuple = config['version_tuple']
@@ -90,9 +91,9 @@ except KeyError:
     print('''ERROR: Config file must contain at least version_tuple,
 \tunsupported_python_version, and deprecated_python_version.''')
     sys.exit(1)
-if DEBUG: print 'version tuple', version_tuple
-if DEBUG: print 'unsupported Python version', unsupported_version
-if DEBUG: print 'deprecated Python version', deprecated_version
+if DEBUG: print('version tuple', version_tuple)
+if DEBUG: print('unsupported Python version', unsupported_version)
+if DEBUG: print('deprecated Python version', deprecated_version)
 
 try:
     release_date = config['release_date']
@@ -102,9 +103,9 @@ else:
     if len(release_date) == 3:
         release_date = release_date + time.localtime()[3:6]
     if len(release_date) != 6:
-        print '''ERROR: Invalid release date''', release_date
+        print('''ERROR: Invalid release date''', release_date)
         sys.exit(1)
-if DEBUG: print 'release date', release_date
+if DEBUG: print('release date', release_date)
 
 if mode == 'develop' and version_tuple[3] != 'alpha':
     version_tuple ==  version_tuple[:3] + ('alpha', 0)
@@ -119,11 +120,11 @@ if len(version_tuple) > 3:
     version_type = version_tuple[3]
 else:
     version_type = 'final'
-if DEBUG: print 'version string', version_string
+if DEBUG: print('version string', version_string)
 
 if version_type not in ['alpha', 'beta', 'candidate', 'final']:
-    print("""ERROR: `%s' is not a valid release type in version tuple;
-\tit must be one of alpha, beta, candidate, or final""" % version_type)
+    print(("""ERROR: `%s' is not a valid release type in version tuple;
+\tit must be one of alpha, beta, candidate, or final""" % version_type))
     sys.exit(1)
 
 try:
@@ -133,13 +134,13 @@ except KeyError:
         month_year = 'MONTH YEAR'
     else:
         month_year =  time.strftime('%B %Y', release_date + (0,0,0))
-if DEBUG: print 'month year', month_year
+if DEBUG: print('month year', month_year)
 
 try:
     copyright_years = config['copyright_years']
 except KeyError:
     copyright_years = '2001 - %d'%(release_date[0] + 1)
-if DEBUG: print 'copyright years', copyright_years
+if DEBUG: print('copyright years', copyright_years)
 
 class UpdateFile(object):
     """
@@ -151,7 +152,7 @@ class UpdateFile(object):
         '''
         if orig is None: orig = file
         try:
-            self.content = open(orig, 'rU').read()
+            self.content = open(orig, 'r').read()
         except IOError:
             # Couldn't open file; don't try to write anything in __del__
             self.file = None
@@ -218,7 +219,7 @@ class UpdateFile(object):
         XXX
         '''
         if self.file is not None and self.content != self.orig:
-            print 'Updating ' + self.file + '...'
+            print('Updating ' + self.file + '...')
             open(self.file, 'w').write(self.content)
 
 if mode == 'post':