[Zope-Checkins] SVN: Zope/trunk/ - Removed Python 2.3.3 as valid option. ZODB 3.3 requires Python

[michael dunstan]

Log message for revision 28201:
  - Removed Python 2.3.3 as valid option. ZODB 3.3 requires Python
    2.3.4 or later.
  

Changed:
  U   Zope/trunk/configure
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/doc/INSTALL.txt
  U   Zope/trunk/lib/python/Zope/Startup/__init__.py

-=-
Modified: Zope/trunk/configure
===================================================================
--- Zope/trunk/configure	2004-10-15 17:53:10 UTC (rev 28200)
+++ Zope/trunk/configure	2004-10-15 19:35:55 UTC (rev 28201)
@@ -18,7 +18,7 @@
 # sys.version) below in "best" to "worst" order, not including the
 # target version.  Up to six acceptable python versions are allowed.
 # Do not include the target version number in this list!
-ACCEPTABLE="2.3.3"
+ACCEPTABLE=""
 
 # provide the executable names for all the acceptable versions
 # (and the target version) below
@@ -115,8 +115,10 @@
          [ -z "$FOUND4" ] && [ -z "$FOUND5" ] && [ -z "$FOUND6" ] ; then
         out ""
         out "  No suitable Python version found.  You should install"
-        out "  Python version $TARGET before continuing.  Versions"
-        out "  $ACCEPTABLE also work, but not as optimally."
+        out "  Python version $TARGET before continuing."
+        if [ "$ACCEPTABLE" ]; then
+            out "  Versions $ACCEPTABLE also work, but not as optimally."
+        fi
         exit 1
     else
         if   [ -n "$FOUND1" ]; then

Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2004-10-15 17:53:10 UTC (rev 28200)
+++ Zope/trunk/doc/CHANGES.txt	2004-10-15 19:35:55 UTC (rev 28201)
@@ -157,6 +157,9 @@
 
     Bugs fixed
 
+     - Removed Python 2.3.3 as valid option. ZODB 3.3 requires Python
+       2.3.4 or later.
+
      - Collector #1332: Added in-place migration of the Catalog.__len__
        attribute to avoid new-style class caching problems. Instances of
        ZCatalog or instances of classes with ZCatalog as base class will be

Modified: Zope/trunk/doc/INSTALL.txt
===================================================================
--- Zope/trunk/doc/INSTALL.txt	2004-10-15 17:53:10 UTC (rev 28200)
+++ Zope/trunk/doc/INSTALL.txt	2004-10-15 19:35:55 UTC (rev 28201)
@@ -7,7 +7,7 @@
 System requirements when building from source
 
    bash or another Bourne shell variant
-   Python 2.3.3 or later installed somewhere in the system PATH
+   Python 2.3.4 or later installed somewhere in the system PATH
    GNU make
    A C compiler (gcc recommended)
 
@@ -148,7 +148,7 @@
 
 Troubleshooting
 
-  - This version of Zope requires Python 2.3.3 or better.
+  - This version of Zope requires Python 2.3.4 or better.
 
   - The Python you run Zope with *must* have threads compiled in,
     which is the case for a vanilla build.  Warning: Zope will not run

Modified: Zope/trunk/lib/python/Zope/Startup/__init__.py
===================================================================
--- Zope/trunk/lib/python/Zope/Startup/__init__.py	2004-10-15 17:53:10 UTC (rev 28200)
+++ Zope/trunk/lib/python/Zope/Startup/__init__.py	2004-10-15 19:35:55 UTC (rev 28201)
@@ -342,8 +342,8 @@
 def check_python_version():
     # check for Python version
     python_version = sys.version.split()[0]
-    optimum_version = '2.3.3'
-    if python_version < '2.3.3':
+    optimum_version = '2.3.4'
+    if python_version < '2.3.4':
         raise ZConfig.ConfigurationError(
             'Invalid python version: %s, the optimal version is %s or higher' %
             (python_version, optimum_version))