http://scons.tigris.org/issues/show_bug.cgi?id=2345

Comb out all code that supported earlier versions of Python.  Most such
code is in snippets of only a few lines and can be identified by having
a Python version string in it.  Such snippets add up; this combing pass
probably got rid of over 500 lines of code.

7 files changed, 0 insertions, 36 deletions

diff --git a/test/SWIG/SWIGOUTDIR-python.py b/test/SWIG/SWIGOUTDIR-python.py
index 763e9c4e..c94e509c 100644
--- a/test/SWIG/SWIGOUTDIR-python.py
+++ b/test/SWIG/SWIGOUTDIR-python.py
@@ -53,11 +53,6 @@ env = Environment(SWIGFLAGS = '-python -c++',
                   LIBS='%(python_lib)s',
                  )
 
-import sys
-if sys.version[0] == '1':
-    # SWIG requires the -classic flag on pre-2.0 Python versions.
-    env.Append(SWIGFLAGS = ' -classic')
-
 env.LoadableModule('python_foo_interface', 'python_foo_interface.i')
 """ % locals())
 
diff --git a/test/SWIG/build-dir.py b/test/SWIG/build-dir.py
index a9d7cb27..4e5bfe99 100644
--- a/test/SWIG/build-dir.py
+++ b/test/SWIG/build-dir.py
@@ -20,7 +20,6 @@
 # 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.
-#
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
@@ -71,11 +70,6 @@ env = Environment(CPPPATH = [".", r'%(python_include)s'],
                   LIBS='%(python_lib)s',
                   )
 
-import sys
-if sys.version[0] == '1':
-    # SWIG requires the -classic flag on pre-2.0 Python versions.
-    env.Append(SWIGFLAGS = '-classic')
-
 Export("env")
 
 #
diff --git a/test/SWIG/live.py b/test/SWIG/live.py
index 8f580c97..4d4369e6 100644
--- a/test/SWIG/live.py
+++ b/test/SWIG/live.py
@@ -72,11 +72,6 @@ foo = Environment(SWIGFLAGS='-python',
                   LIBS='%(python_lib)s',
                   )
 
-import sys
-if sys.version[0] == '1':
-    # SWIG requires the -classic flag on pre-2.0 Python versions.
-    foo.Append(SWIGFLAGS = ' -classic')
-
 swig = foo.Dictionary('SWIG')
 bar = foo.Clone(SWIG = [r'%(python)s', 'wrapper.py', swig])
 foo.LoadableModule(target = 'foo', source = ['foo.c', 'foo.i'])
diff --git a/test/SWIG/module-parens.py b/test/SWIG/module-parens.py
index 78862180..6ae49244 100644
--- a/test/SWIG/module-parens.py
+++ b/test/SWIG/module-parens.py
@@ -52,11 +52,6 @@ env = Environment(SWIGFLAGS = '-python -c++',
                   LIBS='%(python_lib)s',
                   )
 
-import sys
-if sys.version[0] == '1':
-    # SWIG requires the -classic flag on pre-2.0 Python versions.
-    env.Append(SWIGFLAGS = ' -classic')
-
 env.LoadableModule('test1.so', ['test1.i', 'test1.cc'])
 env.LoadableModule('test2.so', ['test2.i', 'test2.cc'])
 """ % locals())
diff --git a/test/SWIG/module-quoted.py b/test/SWIG/module-quoted.py
index 89402ebf..ec7a1327 100644
--- a/test/SWIG/module-quoted.py
+++ b/test/SWIG/module-quoted.py
@@ -52,11 +52,6 @@ env = Environment(SWIGFLAGS = '-python -c++',
                   LIBS='%(python_lib)s',
 		  )
 
-import sys
-if sys.version[0] == '1':
-    # SWIG requires the -classic flag on pre-2.0 Python versions.
-    env.Append(SWIGFLAGS = ' -classic')
-
 env.LoadableModule('test1.so', ['test1.i', 'test1.cc'])
 """ % locals())
 
diff --git a/test/SWIG/remove-modules.py b/test/SWIG/remove-modules.py
index 8ed24eff..964970bb 100644
--- a/test/SWIG/remove-modules.py
+++ b/test/SWIG/remove-modules.py
@@ -71,11 +71,6 @@ foo = Environment(SWIGFLAGS='-python',
                   LIBS='%(python_lib)s',
                   )
 
-import sys
-if sys.version[0] == '1':
-    # SWIG requires the -classic flag on pre-2.0 Python versions.
-    foo.Append(SWIGFLAGS = ' -classic')
-
 foo.LoadableModule(target = 'modulename', source = ['module.i'])
 """ % locals())
 
diff --git a/test/SWIG/subdir.py b/test/SWIG/subdir.py
index d4798f66..0b9f24d4 100644
--- a/test/SWIG/subdir.py
+++ b/test/SWIG/subdir.py
@@ -68,11 +68,6 @@ env = Environment(SWIGFLAGS='-python',
                   LIBS='%(python_lib)s',
                   )
 
-import sys
-if sys.version[0] == '1':
-    # SWIG requires the -classic flag on pre-2.0 Python versions.
-    env.Append(SWIGFLAGS = ' -classic')
-
 env.LoadableModule('sub/_foo',
                    ['sub/foo.i', 'sub/foo.c'],
                    LDMODULEPREFIX='')