[Zope-Checkins] CVS: Zope/bin - zope.py:1.1.2.3

Chris McDonough chrism@zope.com
Sat, 12 Oct 2002 16:29:05 -0400


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

Modified Files:
      Tag: chrism-install-branch
	zope.py 
Log Message:
RPM install now creates an instance_home (in /var/opt/zope).

Changes to initial user stuff based on requirements for RPM install.


=== Zope/bin/zope.py 1.1.2.2 => 1.1.2.3 ===
--- Zope/bin/zope.py:1.1.2.2	Sun Oct  6 17:42:51 2002
+++ Zope/bin/zope.py	Sat Oct 12 16:28:34 2002
@@ -16,7 +16,7 @@
 Do not change this file unless you know what you're doing. ;-)
 """
 
-import os, sys, getopt, warnings, traceback
+import os, sys, getopt, traceback
 
 # assume that this file is sys.argv[0], and that it lives in ZOPE_HOME
 # or ZOPE_HOME/bin in order to set get the default SOFTWARE_HOME appropriately
@@ -30,27 +30,6 @@
     # zope.py is probably in the root directory of the ZOPE_HOME
     SOFTWARE_HOME = os.path.join(HERE, 'lib', 'python')
 
-def check_python_version():
-    # check for Python version
-    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':
-            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).' %
-                   python_version)
-            warnings.warn(err)
-    if python_version[:3] == '2.2':
-        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)
-
 def usage():
     print """
 zope.py [--config-location=filename-or-url] [--software_home=path]
@@ -69,7 +48,6 @@
 """ % {'me':sys.argv[0]}
 
 if __name__ == '__main__':
-    check_python_version()
     config_location = 'zope.conf'
     url = None
     sw_home = SOFTWARE_HOME