Storm

Merge lp://staging/~cjwatson/storm/transaction-2.4.0 into lp://staging/storm

transaction-2.4.0
Merge into trunk

Proposed by Colin Watson on 2019-05-29

Status:	Merged
Merged at revision:	489
Proposed branch:	lp://staging/~cjwatson/storm/transaction-2.4.0
Merge into:	lp://staging/storm
Diff against target:	44 lines (+15/-1) 2 files modified NEWS (+1/-0) tests/zope/zstorm.py (+14/-1)
To merge this branch:	bzr merge lp://staging/~cjwatson/storm/transaction-2.4.0
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Simon Poirier (community)		Approve on 2019-05-31
Adam Collard (community)	2019-05-29	Approve on 2019-05-31
Review via email: mp+368072@code.staging.launchpad.net

Commit message

Cope with ThreadTransactionManager changes in transaction 2.4.0.

Description of the change

transaction 2.4.0 changed ThreadTransactionManager to wrap TransactionManager rather than inheriting from it, which broke tests because the wrapper doesn't have a "free" method. Apply a somewhat ugly workaround.

I've tested this with both transaction 2.3.0 and 2.4.0 (with the aid of an as-yet-unpushed branch to add tox testing support).

Revision history for this message