[Zope-Checkins] CVS: Zope - README.txt:1.12.24.1 setup.py:1.14.4.2 w_pcgi.py:1.7.24.1 wo_pcgi.py:1.25.24.1

[Andreas Jung]

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

Modified Files:
      Tag: ajung-restructuredtext-integration-branch
	README.txt setup.py w_pcgi.py wo_pcgi.py 
Log Message:
merge from trunk

=== Zope/README.txt 1.12 => 1.12.24.1 ===
--- Zope/README.txt:1.12	Mon Aug 19 18:59:15 2002
+++ Zope/README.txt	Sat Nov 16 11:41:50 2002
@@ -29,11 +29,11 @@
 License
 
   The Zope License is included in LICENSE.txt Send your feedback
-  about the license to zope-license@zope.org. 
+  about the license to zope-license@zope.org.
 
 Important
 
-  This release requires Python 2.1.
+  This release requires Python 2.2.2.
 
 Installing Zope
 
@@ -41,9 +41,8 @@
 
 Notes
 
-  * Zope requires Python 2.1.
+  * Zope requires Python 2.2.2.
 
   * Don't forget to check the Zope web site and mailing list.
 
   * Read the source and have fun!
-


=== Zope/setup.py 1.14.4.1 => 1.14.4.2 ===
--- Zope/setup.py:1.14.4.1	Mon Nov  4 11:21:55 2002
+++ Zope/setup.py	Sat Nov 16 11:41:50 2002
@@ -320,9 +320,6 @@
         Extension(name='Missing',
                   include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
                   sources=['../Components/ExtensionClass/src/Missing.c']),
-        Extension(name='Sync',
-                  include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
-                  sources=['../Components/ExtensionClass/src/Sync.c']),
         Extension(name='Record',
                   include_dirs=EXTENSIONCLASS_INCLUDEDIRS,
                   sources=['../Components/ExtensionClass/src/Record.c']),


=== Zope/w_pcgi.py 1.7 => 1.7.24.1 ===
--- Zope/w_pcgi.py:1.7	Wed Aug 14 17:11:39 2002
+++ Zope/w_pcgi.py	Sat Nov 16 11:41:50 2002
@@ -13,11 +13,13 @@
 """Try to do all of the installation steps.
 
 This must be run from the top-level directory of the installation.
-(Yes, this is cheezy.  We'll fix this when we have a chance.
+Yes, this is cheesy.
 
 """
 
 import sys, os
+if not (sys.version >= "2.2" and sys.version_info >= (2, 2, 2)):
+    raise RuntimeError, "Python 2.2.2 or later is required"
 
 def setup(me):
     home=os.path.split(me)[0]


=== Zope/wo_pcgi.py 1.25 => 1.25.24.1 ===
--- Zope/wo_pcgi.py:1.25	Wed Aug 14 17:11:39 2002
+++ Zope/wo_pcgi.py	Sat Nov 16 11:41:50 2002
@@ -13,11 +13,13 @@
 """Try to do all of the installation steps.
 
 This must be run from the top-level directory of the installation.
-\(Yes, this is cheezy.  We'll fix this when we have a chance.)
+Yes, this is cheesy.
 
 """
 
 import sys, os
+if not (sys.version >= "2.2" and sys.version_info >= (2, 2, 2)):
+    raise RuntimeError, "Python 2.2.2 or later is required"
 
 def setup(me):
     home=os.path.split(me)[0]
@@ -31,6 +33,7 @@
     walkandscrub.walkandscrub(home)
     import compilezpy
     import build_extensions
+    build_extensions.build()
     user=group=''
     import default_content; default_content.main(home, user, group)