From cfa399517220689e5992bf5634ed2dcf366473e2 Mon Sep 17 00:00:00 2001
From: Greg Noel <GregNoel@tigris.org>
Date: Tue, 8 Jun 2010 07:50:14 +0000
Subject: Remove the rest of the logic for the noqmtest keyword

---
 QMTest/TestRuntest.py      |  7 -------
 bin/update-release-info.py | 24 ++++++++++++------------
 test/runtest/fallback.py   |  2 +-
 test/runtest/noqmtest.py   |  2 +-
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/QMTest/TestRuntest.py b/QMTest/TestRuntest.py
index 926950e..ec1c5d7 100644
--- a/QMTest/TestRuntest.py
+++ b/QMTest/TestRuntest.py
@@ -111,13 +111,6 @@ class TestRuntest(TestCommon):
             kw['workdir'] = ''
 
         try:
-            noqmtest = kw['noqmtest']
-        except KeyError:
-            noqmtest = 0
-        else:
-            del kw['noqmtest']
-
-        try:
             things_to_copy = kw['things_to_copy']
         except KeyError:
             things_to_copy = [
diff --git a/bin/update-release-info.py b/bin/update-release-info.py
index 4c174ba..372fc74 100644
--- a/bin/update-release-info.py
+++ b/bin/update-release-info.py
@@ -94,6 +94,18 @@ 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']
+except KeyError:
+    release_date = time.localtime()[:6]
+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
+        sys.exit(1)
+if DEBUG: print 'release date', release_date
+
 if mode == 'develop' and version_tuple[3] != 'alpha':
     version_tuple ==  version_tuple[:3] + ('alpha', 0)
 if version_tuple[3] != 'final':
@@ -112,18 +124,6 @@ if version_type not in ['alpha', 'beta', 'candidate', 'final']:
     sys.exit(1)
 
 try:
-    release_date = config['release_date']
-except KeyError:
-    release_date = time.localtime()[:6]
-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
-        sys.exit(1)
-if DEBUG: print 'release date', release_date
-
-try:
     month_year = config['month_year']
 except KeyError:
     if version_type == 'alpha':
diff --git a/test/runtest/fallback.py b/test/runtest/fallback.py
index 027d79d..3bfb9f4 100644
--- a/test/runtest/fallback.py
+++ b/test/runtest/fallback.py
@@ -35,7 +35,7 @@ import TestRuntest
 
 pythonstring = TestRuntest.pythonstring
 
-test = TestRuntest.TestRuntest(noqmtest=1)
+test = TestRuntest.TestRuntest()
 
 # qmtest may be in more than one location in your path
 while test.where_is('qmtest'):
diff --git a/test/runtest/noqmtest.py b/test/runtest/noqmtest.py
index 99352a1..9d0c8e3 100644
--- a/test/runtest/noqmtest.py
+++ b/test/runtest/noqmtest.py
@@ -35,7 +35,7 @@ import TestRuntest
 
 pythonstring = TestRuntest.pythonstring
 
-test = TestRuntest.TestRuntest(noqmtest=1)
+test = TestRuntest.TestRuntest()
 
 test.subdir('test')
 
-- 
cgit v0.12