[Zodb-checkins] SVN: ZODB/trunk/ Merge rev 30307 from 3.4 branch.

[Tim Peters]

Log message for revision 30308:
  Merge rev 30307 from 3.4 branch.
  
  ZApplication.py is moving to Zope trunk.
  

Changed:
  U   ZODB/trunk/NEWS.txt
  D   ZODB/trunk/src/ZODB/ZApplication.py

-=-
Modified: ZODB/trunk/NEWS.txt
===================================================================
--- ZODB/trunk/NEWS.txt	2005-05-09 14:42:21 UTC (rev 30307)
+++ ZODB/trunk/NEWS.txt	2005-05-09 14:44:01 UTC (rev 30308)
@@ -3,6 +3,19 @@
 Release date: DD-MMM-YYYY
 
 
+What's new in ZODB3 3.4a8?
+==========================
+Release date: DD-May-2005
+
+Another internal release, to move Zope 2.8 along.
+
+ZApplication
+------------
+
+- The file ``ZApplication.py`` was moved, from ZODB to Zope(3).  ZODB and
+  Zope3 don't use it, but Zope2 does.
+
+
 What's new in ZODB3 3.4a7?
 ==========================
 Release date: 06-May-2005

Deleted: ZODB/trunk/src/ZODB/ZApplication.py
===================================================================
--- ZODB/trunk/src/ZODB/ZApplication.py	2005-05-09 14:42:21 UTC (rev 30307)
+++ ZODB/trunk/src/ZODB/ZApplication.py	2005-05-09 14:44:01 UTC (rev 30308)
@@ -1,88 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
-#
-##############################################################################
-"""Implement an bobo_application object that is BoboPOS3 aware
-
-This module provides a wrapper that causes a database connection to be created
-and used when bobo publishes a bobo_application object.
-"""
-
-import transaction
-
-connection_open_hooks = []
-
-class ZApplicationWrapper:
-
-    def __init__(self, db, name, klass= None, klass_args= (),
-                 version_cookie_name=None):
-        self._stuff = db, name, version_cookie_name
-        if klass is not None:
-            conn=db.open()
-            root=conn.root()
-            if not root.has_key(name):
-                root[name]=klass()
-                transaction.commit()
-            conn.close()
-            self._klass=klass
-
-
-    # This hack is to overcome a bug in Bobo!
-    def __getattr__(self, name):
-        return getattr(self._klass, name)
-
-    def __bobo_traverse__(self, REQUEST=None, name=None):
-        db, aname, version_support = self._stuff
-        if version_support is not None and REQUEST is not None:
-            version=REQUEST.get(version_support,'')
-        else: version=''
-        conn=db.open(version)
-
-        if connection_open_hooks:
-            for hook in connection_open_hooks:
-                hook(conn)
-
-        # arrange for the connection to be closed when the request goes away
-        cleanup = Cleanup(conn)
-        REQUEST._hold(cleanup)
-
-        conn.setDebugInfo(REQUEST.environ, REQUEST.other)
-
-        v=conn.root()[aname]
-
-        if name is not None:
-            if hasattr(v, '__bobo_traverse__'):
-                return v.__bobo_traverse__(REQUEST, name)
-
-            if hasattr(v,name): return getattr(v,name)
-            return v[name]
-
-        return v
-
-
-    def __call__(self, connection=None):
-        db, aname, version_support = self._stuff
-
-        if connection is None:
-            connection=db.open()
-        elif isinstance(connection, basestring):
-            connection=db.open(connection)
-
-        return connection.root()[aname]
-
-
-class Cleanup:
-    def __init__(self, jar):
-        self._jar = jar
-
-    def __del__(self):
-        self._jar.close()