From d17b1012106133c8f65e8f8e0e105d251a60b14d Mon Sep 17 00:00:00 2001
From: Steven Knight <knight@baldmt.com>
Date: Tue, 15 Jun 2010 21:06:27 +0000
Subject: Revert in-directory changes inadvertently swept up in the last
 checkin.

---
 QMTest/scons_tdb.py     |  2 +-
 bin/install_python.py   | 17 ++++-------------
 bin/scons_dev_master.py |  2 --
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/QMTest/scons_tdb.py b/QMTest/scons_tdb.py
index cc2f127..6be4696 100644
--- a/QMTest/scons_tdb.py
+++ b/QMTest/scons_tdb.py
@@ -134,7 +134,7 @@ def check_exit_status(result, prefix, desc, status):
 
 
 
-class Null(object):
+class Null:
     pass
 
 _null = Null()
diff --git a/bin/install_python.py b/bin/install_python.py
index 0cc805b..86807af 100644
--- a/bin/install_python.py
+++ b/bin/install_python.py
@@ -15,19 +15,10 @@ import sys
 from Command import CommandRunner, Usage
 
 all_versions = [
-    #'1.5.2',   # no longer available at python.org
-    #'2.0.1',   # no longer supported by SCons
-    #'2.1.3',   # no longer supported by SCons
-    '2.2',
-    #'2.2.3',
-    '2.3',
-    #'2.3.7',
-    #'2.4',
-    '2.4.6',
-    '2.5.5',
-    '2.6.5',
-    '3.0.1',
-    '3.1.2',
+    '2.3.7',
+    '2.4.5',
+    #'2.5.2',
+    '2.6',
 ]
 
 def main(argv=None):
diff --git a/bin/scons_dev_master.py b/bin/scons_dev_master.py
index f7621c2..4fa810d 100644
--- a/bin/scons_dev_master.py
+++ b/bin/scons_dev_master.py
@@ -56,8 +56,6 @@ DOCUMENTATION_PACKAGES = [
     'sun-java6-doc',
     'swig-doc',
     'texlive-doc',
-    # Needed for aeguill.sty when generating API docs:
-    'texlive-lang-french',
 ]
 
 TESTING_PACKAGES = [
-- 
cgit v0.12