[Zope-Checkins] CVS: Zope - z2.py:1.83.2.5

[Chris McDonough]

Update of /cvs-repository/Zope
In directory cvs.zope.org:/tmp/cvs-serv17915

Modified Files:
      Tag: Zope-2_6-branch
	z2.py 
Log Message:
Suppress warning when starting with Python 2.2, as no issues have been found running Zope under Python 2.2.  This is, however, still not a "supported" configuration (the removal of the warning is no assurance that there are not still problems).


=== Zope/z2.py 1.83.2.4 => 1.83.2.5 ===
--- Zope/z2.py:1.83.2.4	Thu Jan 30 09:41:42 2003
+++ Zope/z2.py	Thu Feb 27 10:53:08 2003
@@ -364,26 +364,29 @@
 
 try:
     python_version = sys.version.split()[0]
+
     if python_version < '2.1':
         raise 'Invalid python version', python_version
+
     if python_version[:3] == '2.1':
         if python_version[4:5] < '3':
             import warnings
             err = ('You are running Python version %s.  This Python version '
                    'has known bugs that may cause Zope to run improperly. '
                    'Consider upgrading to a Python in the 2.1 series '
-                   'with at least version number 2.1.3.  (Note that Zope does '
-                   'not yet run under any Python 2.2 version).' %
+                   'with at least version number 2.1.3.' %
                    python_version)
             warnings.warn(err)
-    if python_version[:3] == '2.2':
-        import warnings
-        err = ('You are running Python version %s.  This Python version '
-               'has not yet been tested with Zope and you may experience '
-               'operational problems as a result.  Consider using '
-               'Python 2.1.3 instead.' % python_version)
-        warnings.warn(err)
 
+    if python_version[:3] == '2.2':
+        if python_version[4:5] < '2':
+            import warnings
+            err = ('You are running Python version %s.  This Python version '
+                   'has known bugs that may cause Zope to run improperly. '
+                   'Consider upgrading to a Python in the 2.2 series '
+                   'with at least version number 2.2.2.' %
+                   python_version)
+            warnings.warn(err)
 
     opts, args = getopt.getopt(sys.argv[1:],
                                'hz:Z:t:i:a:d:u:w:W:f:p:m:Sl:2DP:rF:L:XM:C',