Merge rev 29107 from 3.3 branch.

Side-port changes checked in from a wrong project (Zope trunk):

r28991 | jim | 2005-01-31 10:45:46 -0500 (Mon, 31 Jan 2005) | 5 lines
...
Renamed the Zope package to Zope2

Import of the Zope package is now deprecated, but will
be supported until Zope 2.11.

src/ZODB/DemoStorage.py

@@ -69,12 +69,12 @@ It is instructive to watch what happens to the internal data structures
 as changes are made.  For example, in Zope, you can create an external
 method::
 
-  import Zope
+  import Zope2
 
   def info(RESPONSE):
       RESPONSE['Content-type']= 'text/plain'
 
-      return Zope.DB._storage._splat()
+      return Zope2.DB._storage._splat()
 
 and call it to monitor the storage.
 

src/ZopeUndo/Prefix.py

@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-"""ZODB undo support for Zope.
+"""ZODB undo support for Zope2.
 
 This package is used to support the Prefix object that Zope uses for
 undo.  It is a separate package only to aid configuration management.

src/scripts/zodbload.py

@@ -197,10 +197,10 @@ def setup(lib_python):
         os.remove(os.path.join(lib_python, '..', '..', 'var', 'Data.fs'))
     except:
         pass
-    import Zope
+    import Zope2
     import Products
     import AccessControl.SecurityManagement
-    app=Zope.app()
+    app=Zope2.app()
 
     Products.ZCatalog.ZCatalog.manage_addZCatalog(app, 'cat', '')
 
@@ -279,16 +279,16 @@ def run1(tid, db, factory, job, args):
         factory.__name__, r)
 
 def run(jobs, tid=''):
-    import Zope
+    import Zope2
     while 1:
         factory, job, args, repeatp = jobs.next()
-        run1(tid, Zope.DB, factory, job, args)
+        run1(tid, Zope2.DB, factory, job, args)
         if repeatp:
             while 1:
                 i = random.randint(0,100)
                 if i > repeatp:
                     break
-                run1(tid, Zope.DB, factory, job, args)
+                run1(tid, Zope2.DB, factory, job, args)
 
 
 def index(connection, messages, catalog):
@@ -733,8 +733,8 @@ def main(args=None):
     if options.has_key('setup'):
         setup(lib_python)
     else:
-        import Zope
-        Zope.startup()
+        import Zope2
+        Zope2.startup()
 
     #from ThreadedAsync.LoopCallback import loop
     #threading.Thread(target=loop, args=(), name='asyncore').start()