Commit ccdc5e33 authored by Michael Dunstan's avatar Michael Dunstan

- Removed Python 2.3.3 as valid option. ZODB 3.3 requires Python

  2.3.4 or later.
parent d2450e66
...@@ -18,7 +18,7 @@ TARGET="2.3.4" ...@@ -18,7 +18,7 @@ TARGET="2.3.4"
# sys.version) below in "best" to "worst" order, not including the # sys.version) below in "best" to "worst" order, not including the
# target version. Up to six acceptable python versions are allowed. # target version. Up to six acceptable python versions are allowed.
# Do not include the target version number in this list! # Do not include the target version number in this list!
ACCEPTABLE="2.3.3" ACCEPTABLE=""
# provide the executable names for all the acceptable versions # provide the executable names for all the acceptable versions
# (and the target version) below # (and the target version) below
...@@ -115,8 +115,10 @@ get_python() { ...@@ -115,8 +115,10 @@ get_python() {
[ -z "$FOUND4" ] && [ -z "$FOUND5" ] && [ -z "$FOUND6" ] ; then [ -z "$FOUND4" ] && [ -z "$FOUND5" ] && [ -z "$FOUND6" ] ; then
out "" out ""
out " No suitable Python version found. You should install" out " No suitable Python version found. You should install"
out " Python version $TARGET before continuing. Versions" out " Python version $TARGET before continuing."
out " $ACCEPTABLE also work, but not as optimally." if [ "$ACCEPTABLE" ]; then
out " Versions $ACCEPTABLE also work, but not as optimally."
fi
exit 1 exit 1
else else
if [ -n "$FOUND1" ]; then if [ -n "$FOUND1" ]; then
......
...@@ -157,6 +157,9 @@ Zope Changes ...@@ -157,6 +157,9 @@ Zope Changes
Bugs fixed 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__ - Collector #1332: Added in-place migration of the Catalog.__len__
attribute to avoid new-style class caching problems. Instances of attribute to avoid new-style class caching problems. Instances of
ZCatalog or instances of classes with ZCatalog as base class will be ZCatalog or instances of classes with ZCatalog as base class will be
......
...@@ -7,7 +7,7 @@ Building and installing Zope from source ...@@ -7,7 +7,7 @@ Building and installing Zope from source
System requirements when building from source System requirements when building from source
bash or another Bourne shell variant 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 GNU make
A C compiler (gcc recommended) A C compiler (gcc recommended)
...@@ -148,7 +148,7 @@ Integrating Zope With An Existing Webserver ...@@ -148,7 +148,7 @@ Integrating Zope With An Existing Webserver
Troubleshooting 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, - The Python you run Zope with *must* have threads compiled in,
which is the case for a vanilla build. Warning: Zope will not run which is the case for a vanilla build. Warning: Zope will not run
......
...@@ -342,8 +342,8 @@ class UnixZopeStarter(ZopeStarter): ...@@ -342,8 +342,8 @@ class UnixZopeStarter(ZopeStarter):
def check_python_version(): def check_python_version():
# check for Python version # check for Python version
python_version = sys.version.split()[0] python_version = sys.version.split()[0]
optimum_version = '2.3.3' optimum_version = '2.3.4'
if python_version < '2.3.3': if python_version < '2.3.4':
raise ZConfig.ConfigurationError( raise ZConfig.ConfigurationError(
'Invalid python version: %s, the optimal version is %s or higher' % 'Invalid python version: %s, the optimal version is %s or higher' %
(python_version, optimum_version)) (python_version, optimum_version))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment