Imported Upstream version 2.5.0+repackupstream/2.5.0+repack

6 files changed, 21 insertions, 25 deletions

diff --git a/bin/SConsDoc.py b/bin/SConsDoc.py
index 39434c7..ff8a312 100644
--- a/bin/SConsDoc.py
+++ b/bin/SConsDoc.py
@@ -167,7 +167,7 @@ xsi = "http://www.w3.org/2001/XMLSchema-instance"
 
 # Header comment with copyright
 copyright_comment = """
-Copyright (c) 2001 - 2015 The SCons Foundation
+Copyright (c) 2001 - 2016 The SCons Foundation
 
 This file is processed by the bin/SConsDoc.py module.
 See its __doc__ string for a discussion of the format.
diff --git a/bin/import-test.py b/bin/import-test.py
index 93f1c62..6182afc 100644
--- a/bin/import-test.py
+++ b/bin/import-test.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2001 - 2015 The SCons Foundation
+# Copyright (c) 2001 - 2016 The SCons Foundation
 #
 # tree2test.py - turn a directory tree into TestSCons code
 #
@@ -25,7 +25,7 @@
 # """ triple-quotes will need to have their contents edited by hand.
 #
 
-__revision__ = "bin/import-test.py rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 bdbaddog"
+__revision__ = "bin/import-test.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog"
 
 import os.path
 import sys
diff --git a/bin/linecount.py b/bin/linecount.py
index 5b17780..64cd855 100644
--- a/bin/linecount.py
+++ b/bin/linecount.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2001 - 2015 The SCons Foundation
+# Copyright (c) 2001 - 2016 The SCons Foundation
 #
 # Count statistics about SCons test and source files.  This must be run
 # against a fully-populated tree (for example, one that's been freshly
@@ -23,7 +23,7 @@
 # interesting one for most purposes.
 from __future__ import division
 
-__revision__ = "bin/linecount.py rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 bdbaddog"
+__revision__ = "bin/linecount.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog"
 
 import os.path
 
diff --git a/bin/restore.sh b/bin/restore.sh
index c393b00..9ec0e1e 100644
--- a/bin/restore.sh
+++ b/bin/restore.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 #
-# Simple hack script to restore __revision__, __COPYRIGHT_, 2.4.1
+# Simple hack script to restore __revision__, __COPYRIGHT_, 2.5.0
 # and other similar variables to what gets checked in to source.  This
 # comes in handy when people send in diffs based on the released source.
 #
@@ -22,9 +22,9 @@ header() {
 for i in `find $DIRS -name '*.py'`; do
     header $i
     ed $i <<EOF
-g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2015 The SCons Foundation/p
+g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2016 The SCons Foundation/p
 w
-/^__revision__ = /s/= .*/= "bin/restore.sh rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 bdbaddog"/p
+/^__revision__ = /s/= .*/= "bin/restore.sh rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog"/p
 w
 q
 EOF
@@ -33,9 +33,9 @@ done
 for i in `find $DIRS -name 'scons.bat'`; do
     header $i
     ed $i <<EOF
-g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2015 The SCons Foundation/p
+g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2016 The SCons Foundation/p
 w
-/^@REM src\/script\/scons.bat/s/@REM .* knight/@REM bin/restore.sh rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 bdbaddog/p
+/^@REM src\/script\/scons.bat/s/@REM .* knight/@REM bin/restore.sh rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog/p
 w
 q
 EOF
@@ -44,13 +44,13 @@ done
 for i in `find $DIRS -name '__init__.py' -o -name 'scons.py' -o -name 'sconsign.py'`; do
     header $i
     ed $i <<EOF
-/^__version__ = /s/= .*/= "2.4.1"/p
+/^__version__ = /s/= .*/= "2.5.0"/p
 w
-/^__build__ = /s/= .*/= "rel_2.4.1:3453:73fefd3ea0b0"/p
+/^__build__ = /s/= .*/= "rel_2.5.0:3543:937e55cd78f7[MODIFIED]"/p
 w
 /^__buildsys__ = /s/= .*/= "ubuntu1404-32bit"/p
 w
-/^__date__ = /s/= .*/= "2015/11/09 03:25:05"/p
+/^__date__ = /s/= .*/= "2016/04/09 11:29:54"/p
 w
 /^__developer__ = /s/= .*/= "bdbaddog"/p
 w
@@ -61,7 +61,7 @@ done
 for i in `find $DIRS -name 'setup.py'`; do
     header $i
     ed $i <<EOF
-/^ *version = /s/= .*/= "2.4.1",/p
+/^ *version = /s/= .*/= "2.5.0",/p
 w
 q
 EOF
@@ -70,11 +70,11 @@ done
 for i in `find $DIRS -name '*.txt'`; do
     header $i
     ed $i <<EOF
-g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2015 The SCons Foundation/p
+g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2016 The SCons Foundation/p
 w
-/# [^ ]* 0.96.[CD][0-9]* [0-9\/]* [0-9:]* knight$/s/.*/# bin/restore.sh rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 bdbaddog/p
+/# [^ ]* 0.96.[CD][0-9]* [0-9\/]* [0-9:]* knight$/s/.*/# bin/restore.sh rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog/p
 w
-/Version [0-9][0-9]*\.[0-9][0-9]*/s//Version 2.4.1/p
+/Version [0-9][0-9]*\.[0-9][0-9]*/s//Version 2.5.0/p
 w
 q
 EOF
@@ -83,7 +83,7 @@ done
 for i in `find $DIRS -name '*.xml'`; do
     header $i
     ed $i <<EOF
-g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2015 The SCons Foundation/p
+g/Copyright (c) 2001.*SCons Foundation/s//Copyright (c) 2001 - 2016 The SCons Foundation/p
 w
 q
 EOF
diff --git a/bin/scons-proc.py b/bin/scons-proc.py
index 9567db8..d6a770b 100644
--- a/bin/scons-proc.py
+++ b/bin/scons-proc.py
@@ -14,11 +14,7 @@ import os
 import re
 import string
 import sys
-try:
-    from io import StringIO     # usable as of 2.6; takes unicode only
-except ImportError:
-    # No 'io' module or no StringIO in io
-    exec('from cStringIO import StringIO')
+from io import StringIO     # usable as of 2.6; takes unicode only
 
 import SConsDoc
 from SConsDoc import tf as stf
diff --git a/bin/update-release-info.py b/bin/update-release-info.py
index 510440d..4b60d9d 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 - 2015 The SCons Foundation
+# Copyright (c) 2001 - 2016 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -57,7 +57,7 @@ In 'post' mode, files are prepared for the next release cycle:
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-__revision__ = "bin/update-release-info.py rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 bdbaddog"
+__revision__ = "bin/update-release-info.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog"
 
 import os
 import sys