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

[Tim Peters]

Log message for revision 30292:
  Merge rev 30291 from 3.4 branch.
  
  __call__() got broken about a year ago.
  
  There are no tests for this.
  

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

-=-
Modified: ZODB/trunk/NEWS.txt
===================================================================
--- ZODB/trunk/NEWS.txt	2005-05-06 18:17:11 UTC (rev 30291)
+++ ZODB/trunk/NEWS.txt	2005-05-06 18:18:08 UTC (rev 30292)
@@ -19,7 +19,13 @@
   transaction object.  As a result, the ``afterCompletion()`` methods of
   registered synchronizers weren't called when the first transaction ended.
 
+ZApplication
+------------
 
+- The ``__call__`` method didn't work if a non-None ``connection`` string
+  argument was passed.  Thanks to Stefan Holek for noticing.
+
+
 What's new in ZODB3 3.4a6?
 ==========================
 Release date: 05-May-2005

Modified: ZODB/trunk/src/ZODB/ZApplication.py
===================================================================
--- ZODB/trunk/src/ZODB/ZApplication.py	2005-05-06 18:17:11 UTC (rev 30291)
+++ ZODB/trunk/src/ZODB/ZApplication.py	2005-05-06 18:18:08 UTC (rev 30292)
@@ -74,7 +74,7 @@
 
         if connection is None:
             connection=db.open()
-        elif isinstance(type, basestring):
+        elif isinstance(connection, basestring):
             connection=db.open(connection)
 
         return connection.root()[aname]