Merged default branch into python3-port to keep it up to date.

Hand-updated a few things to keep them python3-safe, and handled
several merge conflicts.

18 files changed, 18 insertions, 18 deletions

diff --git a/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOM.py b/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOM.py
index eb75a8f0..d5af0ea0 100644
--- a/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOM.py
+++ b/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOM.py
@@ -42,7 +42,7 @@ Environment(tools = ['BitKeeper']).BitKeeper()
 msg_bk = """The BitKeeper() factory is deprecated and there is no replacement."""
 warn_bk = test.deprecated_fatal('deprecated-build-dir', msg_bk)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.subdir('BitKeeper', ['BitKeeper', 'sub'], 'sub')
diff --git a/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOMSTR.py b/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOMSTR.py
index ca58b831..ef70cb82 100644
--- a/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOMSTR.py
+++ b/test/Deprecated/SourceCode/BitKeeper/BITKEEPERCOMSTR.py
@@ -42,7 +42,7 @@ Environment(tools = ['BitKeeper']).BitKeeper()
 msg_bk = """The BitKeeper() factory is deprecated and there is no replacement."""
 warn_bk = test.deprecated_fatal('deprecated-build-dir', msg_bk)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.subdir('BitKeeper', ['BitKeeper', 'sub'], 'sub')
diff --git a/test/Deprecated/SourceCode/BitKeeper/BitKeeper.py b/test/Deprecated/SourceCode/BitKeeper/BitKeeper.py
index 29597363..04dfd9b0 100644
--- a/test/Deprecated/SourceCode/BitKeeper/BitKeeper.py
+++ b/test/Deprecated/SourceCode/BitKeeper/BitKeeper.py
@@ -42,7 +42,7 @@ Environment(tools = ['BitKeeper']).BitKeeper()
 msg_bk = """The BitKeeper() factory is deprecated and there is no replacement."""
 warn_bk = test.deprecated_fatal('deprecated-build-dir', msg_bk)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.skip_test("Need BitKeeper to debug these tests.\n")
diff --git a/test/Deprecated/SourceCode/CVS/CVS.py b/test/Deprecated/SourceCode/CVS/CVS.py
index b5b51bcf..a1276fe7 100644
--- a/test/Deprecated/SourceCode/CVS/CVS.py
+++ b/test/Deprecated/SourceCode/CVS/CVS.py
@@ -40,7 +40,7 @@ Environment(tools = ['CVS']).CVS('')
 msg_cvs = """The CVS() factory is deprecated and there is no replacement."""
 warn_cvs = test.deprecated_fatal('deprecated-build-dir', msg_cvs)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 cvs = test.where_is('cvs')
diff --git a/test/Deprecated/SourceCode/CVS/CVSCOM.py b/test/Deprecated/SourceCode/CVS/CVSCOM.py
index b9d9c769..a0f84000 100644
--- a/test/Deprecated/SourceCode/CVS/CVSCOM.py
+++ b/test/Deprecated/SourceCode/CVS/CVSCOM.py
@@ -42,7 +42,7 @@ Environment(tools = ['CVS']).CVS('')
 msg_cvs = """The CVS() factory is deprecated and there is no replacement."""
 warn_cvs = test.deprecated_fatal('deprecated-build-dir', msg_cvs)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.subdir('CVS', ['CVS', 'sub'], 'sub')
diff --git a/test/Deprecated/SourceCode/CVS/CVSCOMSTR.py b/test/Deprecated/SourceCode/CVS/CVSCOMSTR.py
index 9a6cf647..f793d662 100644
--- a/test/Deprecated/SourceCode/CVS/CVSCOMSTR.py
+++ b/test/Deprecated/SourceCode/CVS/CVSCOMSTR.py
@@ -42,7 +42,7 @@ Environment(tools = ['CVS']).CVS('')
 msg_cvs = """The CVS() factory is deprecated and there is no replacement."""
 warn_cvs = test.deprecated_fatal('deprecated-build-dir', msg_cvs)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.subdir('CVS', ['CVS', 'sub'], 'sub')
diff --git a/test/Deprecated/SourceCode/Perforce/P4COM.py b/test/Deprecated/SourceCode/Perforce/P4COM.py
index 92ae5478..9b9bab1e 100644
--- a/test/Deprecated/SourceCode/Perforce/P4COM.py
+++ b/test/Deprecated/SourceCode/Perforce/P4COM.py
@@ -42,7 +42,7 @@ Environment(tools = ['Perforce']).Perforce()
 msg_p4 = """The Perforce() factory is deprecated and there is no replacement."""
 warn_p4 = test.deprecated_fatal('deprecated-build-dir', msg_p4)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.subdir('Perforce', ['Perforce', 'sub'], 'sub')
diff --git a/test/Deprecated/SourceCode/Perforce/P4COMSTR.py b/test/Deprecated/SourceCode/Perforce/P4COMSTR.py
index d0228244..7a240210 100644
--- a/test/Deprecated/SourceCode/Perforce/P4COMSTR.py
+++ b/test/Deprecated/SourceCode/Perforce/P4COMSTR.py
@@ -43,7 +43,7 @@ Environment(tools = ['Perforce']).Perforce()
 msg_p4 = """The Perforce() factory is deprecated and there is no replacement."""
 warn_p4 = test.deprecated_fatal('deprecated-build-dir', msg_p4)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.subdir('Perforce', ['Perforce', 'sub'], 'sub')
diff --git a/test/Deprecated/SourceCode/Perforce/Perforce.py b/test/Deprecated/SourceCode/Perforce/Perforce.py
index ebf9cfb1..3be22d8d 100644
--- a/test/Deprecated/SourceCode/Perforce/Perforce.py
+++ b/test/Deprecated/SourceCode/Perforce/Perforce.py
@@ -43,7 +43,7 @@ Environment(tools = ['Perforce']).Perforce()
 msg_p4 = """The Perforce() factory is deprecated and there is no replacement."""
 warn_p4 = test.deprecated_fatal('deprecated-build-dir', msg_p4)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 class TestPerforce(TestSCons.TestSCons):
diff --git a/test/Deprecated/SourceCode/RCS/RCS_COCOM.py b/test/Deprecated/SourceCode/RCS/RCS_COCOM.py
index 20f0da69..765c88cb 100644
--- a/test/Deprecated/SourceCode/RCS/RCS_COCOM.py
+++ b/test/Deprecated/SourceCode/RCS/RCS_COCOM.py
@@ -42,7 +42,7 @@ Environment(tools = ['RCS']).RCS()
 msg_rcs = """The RCS() factory is deprecated and there is no replacement."""
 warn_rcs = test.deprecated_fatal('deprecated-build-dir', msg_rcs)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.subdir('RCS', ['RCS', 'sub'], 'sub')
diff --git a/test/Deprecated/SourceCode/RCS/RCS_COCOMSTR.py b/test/Deprecated/SourceCode/RCS/RCS_COCOMSTR.py
index 3626376c..57088fa6 100644
--- a/test/Deprecated/SourceCode/RCS/RCS_COCOMSTR.py
+++ b/test/Deprecated/SourceCode/RCS/RCS_COCOMSTR.py
@@ -42,7 +42,7 @@ Environment(tools = ['RCS']).RCS()
 msg_rcs = """The RCS() factory is deprecated and there is no replacement."""
 warn_rcs = test.deprecated_fatal('deprecated-build-dir', msg_rcs)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.subdir('RCS', ['RCS', 'sub'], 'sub')
diff --git a/test/Deprecated/SourceCode/RCS/changed.py b/test/Deprecated/SourceCode/RCS/changed.py
index 14c80bd7..fec1ba36 100644
--- a/test/Deprecated/SourceCode/RCS/changed.py
+++ b/test/Deprecated/SourceCode/RCS/changed.py
@@ -38,7 +38,7 @@ Environment(tools = ['RCS']).RCS()
 msg_rcs = """The RCS() factory is deprecated and there is no replacement."""
 warn_rcs = test.deprecated_fatal('deprecated-build-dir', msg_rcs)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 rcs = test.where_is('rcs')
diff --git a/test/Deprecated/SourceCode/RCS/explicit.py b/test/Deprecated/SourceCode/RCS/explicit.py
index 53c336af..96ce02f8 100644
--- a/test/Deprecated/SourceCode/RCS/explicit.py
+++ b/test/Deprecated/SourceCode/RCS/explicit.py
@@ -40,7 +40,7 @@ Environment(tools = ['RCS']).RCS()
 msg_rcs = """The RCS() factory is deprecated and there is no replacement."""
 warn_rcs = test.deprecated_fatal('deprecated-build-dir', msg_rcs)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 rcs = test.where_is('rcs')
diff --git a/test/Deprecated/SourceCode/SCCS/SCCSCOM.py b/test/Deprecated/SourceCode/SCCS/SCCSCOM.py
index a08241f1..6ad02ac1 100644
--- a/test/Deprecated/SourceCode/SCCS/SCCSCOM.py
+++ b/test/Deprecated/SourceCode/SCCS/SCCSCOM.py
@@ -42,7 +42,7 @@ Environment(tools = ['SCCS']).SCCS()
 msg_sccs = """The SCCS() factory is deprecated and there is no replacement."""
 warn_sccs = test.deprecated_fatal('deprecated-build-dir', msg_sccs)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.subdir('SCCS', ['SCCS', 'sub'], 'sub')
diff --git a/test/Deprecated/SourceCode/SCCS/SCCSCOMSTR.py b/test/Deprecated/SourceCode/SCCS/SCCSCOMSTR.py
index 5204ee3e..a7574955 100644
--- a/test/Deprecated/SourceCode/SCCS/SCCSCOMSTR.py
+++ b/test/Deprecated/SourceCode/SCCS/SCCSCOMSTR.py
@@ -42,7 +42,7 @@ Environment(tools = ['SCCS']).SCCS()
 msg_sccs = """The SCCS() factory is deprecated and there is no replacement."""
 warn_sccs = test.deprecated_fatal('deprecated-build-dir', msg_sccs)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 test.subdir('SCCS', ['SCCS', 'sub'], 'sub')
diff --git a/test/Deprecated/SourceCode/SCCS/diskcheck.py b/test/Deprecated/SourceCode/SCCS/diskcheck.py
index d2364b6d..060c7a28 100644
--- a/test/Deprecated/SourceCode/SCCS/diskcheck.py
+++ b/test/Deprecated/SourceCode/SCCS/diskcheck.py
@@ -40,7 +40,7 @@ Environment(tools = ['SCCS']).SCCS()
 msg_sccs = """The SCCS() factory is deprecated and there is no replacement."""
 warn_sccs = test.deprecated_fatal('deprecated-build-dir', msg_sccs)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 sccs = test.where_is('sccs')
diff --git a/test/Deprecated/SourceCode/SourceCode.py b/test/Deprecated/SourceCode/SourceCode.py
index d440581a..b5c0ba9c 100644
--- a/test/Deprecated/SourceCode/SourceCode.py
+++ b/test/Deprecated/SourceCode/SourceCode.py
@@ -38,7 +38,7 @@ SourceCode('.', None)
 """)
 
 msg = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warning = test.deprecated_warning('deprecated-source-code', msg)
 
 test.subdir('sub', 'sub2')
diff --git a/test/Deprecated/SourceCode/Subversion.py b/test/Deprecated/SourceCode/Subversion.py
index 7d45a8ca..7ed4b154 100644
--- a/test/Deprecated/SourceCode/Subversion.py
+++ b/test/Deprecated/SourceCode/Subversion.py
@@ -40,7 +40,7 @@ Environment(tools = ['Subversion']).Subversion('')
 msg_svn = """The Subversion() factory is deprecated and there is no replacement."""
 warn_svn = test.deprecated_fatal('deprecated-build-dir', msg_svn)
 msg_sc = """SourceCode() has been deprecated and there is no replacement.
-\tIf you need this function, please contact dev@scons.tigris.org."""
+\tIf you need this function, please contact scons-dev@scons.org"""
 warn_sc = test.deprecated_wrap(msg_sc)
 
 svn = test.where_is('svn')