From 79c7c88eec4b53f8afe35ff8379299634f13d7a3 Mon Sep 17 00:00:00 2001
From: richard <richard@57a73879-2fb5-44c3-a270-3262357dd7e2>
Date: Thu, 13 Dec 2001 00:20:01 +0000
Subject: [PATCH]  . Centralised the python version check code, bumped version
 to 2.1.1 (really    needs to be 2.1.2, but that isn't released yet :)

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@461 57a73879-2fb5-44c3-a270-3262357dd7e2
---
 CHANGES.txt              |  2 ++
 cgi-bin/roundup.cgi      | 22 ++++++++++++++++------
 doc/index.html           |  7 ++-----
 roundup-admin            | 14 +++++++++-----
 roundup-mailgw           | 22 ++++++++++++++++++----
 roundup-server           | 23 ++++++++++++++++++-----
 roundup/version_check.py | 31 +++++++++++++++++++++++++++++++
 7 files changed, 96 insertions(+), 25 deletions(-)
 create mode 100644 roundup/version_check.py

diff --git a/CHANGES.txt b/CHANGES.txt
index 027deba..7d44745 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -23,6 +23,8 @@ Feature:
  . Message author's name appears in From: instead of roundup instance name
    (which still appears in the Reply-To:)
  . Added a Zope frontend for roundup.
+ . Centralised the python version check code, bumped version to 2.1.1 (really
+   needs to be 2.1.2, but that isn't released yet :)
 
 Fixed:
  . Lots of bugs, thanks Roché and others on the devel mailing list!
diff --git a/cgi-bin/roundup.cgi b/cgi-bin/roundup.cgi
index 8434db1..f1d5518 100755
--- a/cgi-bin/roundup.cgi
+++ b/cgi-bin/roundup.cgi
@@ -16,14 +16,10 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: roundup.cgi,v 1.21 2001-12-02 05:06:16 richard Exp $
+# $Id: roundup.cgi,v 1.22 2001-12-13 00:20:01 richard Exp $
 
 # python version check
-import sys
-if not hasattr(sys, 'version_info') or sys.version_info[:2] < (2,1):
-    print "Content-Type: text/plain\n"
-    print "Roundup requires Python 2.1 or newer."
-    sys.exit(0)
+from roundup import version_check
 
 #
 ##  Configuration
@@ -200,6 +196,20 @@ LOG.close()
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.21  2001/12/02 05:06:16  richard
+# . We now use weakrefs in the Classes to keep the database reference, so
+#   the close() method on the database is no longer needed.
+#   I bumped the minimum python requirement up to 2.1 accordingly.
+# . #487480 ] roundup-server
+# . #487476 ] INSTALL.txt
+#
+# I also cleaned up the change message / post-edit stuff in the cgi client.
+# There's now a clearly marked "TODO: append the change note" where I believe
+# the change note should be added there. The "changes" list will obviously
+# have to be modified to be a dict of the changes, or somesuch.
+#
+# More testing needed.
+#
 # Revision 1.20  2001/11/26 22:55:56  richard
 # Feature:
 #  . Added INSTANCE_NAME to configuration - used in web and email to identify
diff --git a/doc/index.html b/doc/index.html
index 342e02d..59d2f35 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -47,10 +47,7 @@
 <h2><a name="requires">Prerequisites</a></h2>
 
 <dl>
-    <dt>Either:
-    <dd>Python 2.0 with pydoc installed. See http://www.lfw.org/ for pydoc.
-    <dt>or
-    <dd>Python 2.1 or later
+	<dd>Python 2.1.1 is required for the correct operation of roundup
 </dl>
 
 Download the latest version from
@@ -1200,7 +1197,7 @@ system on their time.
 
 <p>&nbsp;</p>
 <hr>
-$Id: index.html,v 1.20 2001-12-10 00:57:38 richard Exp $
+$Id: index.html,v 1.21 2001-12-13 00:20:01 richard Exp $
 <p>&nbsp;</p>
 
 </body></html>
diff --git a/roundup-admin b/roundup-admin
index 83306f6..3bfaed1 100755
--- a/roundup-admin
+++ b/roundup-admin
@@ -16,12 +16,10 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: roundup-admin,v 1.52 2001-12-12 21:47:45 richard Exp $
+# $Id: roundup-admin,v 1.53 2001-12-13 00:20:00 richard Exp $
 
-import sys
-if not hasattr(sys, 'version_info') or sys.version_info[:2] < (2,1):
-    print 'Roundup requires python 2.1 or later.'
-    sys.exit(1)
+# python version check
+from roundup import version_check
 
 import string, os, getpass, getopt, re, UserDict
 try:
@@ -980,6 +978,12 @@ if __name__ == '__main__':
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.52  2001/12/12 21:47:45  richard
+#  . Message author's name appears in From: instead of roundup instance name
+#    (which still appears in the Reply-To:)
+#  . envelope-from is now set to the roundup-admin and not roundup itself so
+#    delivery reports aren't sent to roundup (thanks Patrick Ohly)
+#
 # Revision 1.51  2001/12/10 00:57:38  richard
 # From CHANGES:
 #  . Added the "display" command to the admin tool - displays a node's values
diff --git a/roundup-mailgw b/roundup-mailgw
index 9e3a006..1e1f4b4 100755
--- a/roundup-mailgw
+++ b/roundup-mailgw
@@ -16,12 +16,12 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: roundup-mailgw,v 1.17 2001-12-02 05:06:16 richard Exp $
+# $Id: roundup-mailgw,v 1.18 2001-12-13 00:20:01 richard Exp $
+
+# python version check
+from roundup import version_check
 
 import sys, os, re, cStringIO
-if not hasattr(sys, 'version_info') or sys.version_info[:2] < (2,1):
-    print "Roundup requires Python 2.1 or newer."
-    sys.exit(1)
 
 from roundup.mailgw import Message
 
@@ -168,6 +168,20 @@ if __name__ == '__main__':
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.17  2001/12/02 05:06:16  richard
+# . We now use weakrefs in the Classes to keep the database reference, so
+#   the close() method on the database is no longer needed.
+#   I bumped the minimum python requirement up to 2.1 accordingly.
+# . #487480 ] roundup-server
+# . #487476 ] INSTALL.txt
+#
+# I also cleaned up the change message / post-edit stuff in the cgi client.
+# There's now a clearly marked "TODO: append the change note" where I believe
+# the change note should be added there. The "changes" list will obviously
+# have to be modified to be a dict of the changes, or somesuch.
+#
+# More testing needed.
+#
 # Revision 1.16  2001/11/30 18:23:55  jhermann
 # Cleaned up strange import (less pollution, too)
 #
diff --git a/roundup-server b/roundup-server
index b56e644..dbf2b22 100755
--- a/roundup-server
+++ b/roundup-server
@@ -20,13 +20,12 @@
 
 Based on CGIHTTPServer in the Python library.
 
-$Id: roundup-server,v 1.21 2001-12-02 05:06:16 richard Exp $
+$Id: roundup-server,v 1.22 2001-12-13 00:20:01 richard Exp $
 
 """
-import sys
-if not hasattr(sys, 'version_info') or sys.version_info[:2] < (2,1):
-    print "Roundup requires Python 2.1 or newer."
-    sys.exit(0)
+
+# python version check
+from roundup import version_check
 
 import os, urllib, StringIO, traceback, cgi, binascii, string, getopt, imp
 import BaseHTTPServer
@@ -249,6 +248,20 @@ if __name__ == '__main__':
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.21  2001/12/02 05:06:16  richard
+# . We now use weakrefs in the Classes to keep the database reference, so
+#   the close() method on the database is no longer needed.
+#   I bumped the minimum python requirement up to 2.1 accordingly.
+# . #487480 ] roundup-server
+# . #487476 ] INSTALL.txt
+#
+# I also cleaned up the change message / post-edit stuff in the cgi client.
+# There's now a clearly marked "TODO: append the change note" where I believe
+# the change note should be added there. The "changes" list will obviously
+# have to be modified to be a dict of the changes, or somesuch.
+#
+# More testing needed.
+#
 # Revision 1.20  2001/11/26 22:55:56  richard
 # Feature:
 #  . Added INSTANCE_NAME to configuration - used in web and email to identify
diff --git a/roundup/version_check.py b/roundup/version_check.py
new file mode 100644
index 0000000..499ba61
--- /dev/null
+++ b/roundup/version_check.py
@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2001 Bizar Software Pty Ltd (http://www.bizarsoftware.com.au/)
+# This module is free software, and you may redistribute it and/or modify
+# under the same terms as Python, so long as this copyright message and
+# disclaimer are retained in their original form.
+#
+# IN NO EVENT SHALL BIZAR SOFTWARE PTY LTD BE LIABLE TO ANY PARTY FOR
+# DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING
+# OUT OF THE USE OF THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# BIZAR SOFTWARE PTY LTD SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+# BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE.  THE CODE PROVIDED HEREUNDER IS ON AN "AS IS"
+# BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
+# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+# 
+# $Id: version_check.py,v 1.1 2001-12-13 00:20:01 richard Exp $
+
+import sys
+if not hasattr(sys, 'version_info') or sys.version_info[:2] < (2,1,1):
+    print "Content-Type: text/plain\n"
+    print "Roundup requires Python 2.1.1 or newer."
+    sys.exit(0)
+
+#
+# $Log: not supported by cvs2svn $
+#
+#
+# vim: set filetype=python ts=4 sw=4 et si
-- 
2.30.2