Commit 3416d261 authored by Tim Peters's avatar Tim Peters

Merge rev 30291 from 3.4 branch.

__call__() got broken about a year ago.

There are no tests for this.
parent f66e9a3d
...@@ -19,6 +19,12 @@ transaction ...@@ -19,6 +19,12 @@ transaction
transaction object. As a result, the ``afterCompletion()`` methods of transaction object. As a result, the ``afterCompletion()`` methods of
registered synchronizers weren't called when the first transaction ended. 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? What's new in ZODB3 3.4a6?
========================== ==========================
......
...@@ -74,7 +74,7 @@ class ZApplicationWrapper: ...@@ -74,7 +74,7 @@ class ZApplicationWrapper:
if connection is None: if connection is None:
connection=db.open() connection=db.open()
elif isinstance(type, basestring): elif isinstance(connection, basestring):
connection=db.open(connection) connection=db.open(connection)
return connection.root()[aname] return connection.root()[aname]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment