Merge branch 'master' of github.com:morepath/more.transaction

CHANGES.txt

@@ -14,13 +14,17 @@ CHANGES
   mounted applications. This is fixed in Morepath's new
   ``request.reset`` method, which we now use.
 
-- Remove Python 2.5 syntax.
+- Replaced custom exception re-raise machinery with a ``raise``
+  statement with no arguments.  That was legacy code from
+  ``pyramid_tm`` when they were using a context manager instead of a
+  ``try...except`` statement.
+
+  See https://github.com/morepath/more.transaction/issues/7
 
-- We had inherited a rather complicated ``reraise`` implementation
-  from ``pyramid_tm``. It appears to be in ``pyramid_tm`` for historical
-  reasons only, so we replaced it with a much simpler bare ``raise``.
+- Update test suite to take advantage of Morepath 0.15.
+
+- Remove Python 2.5 syntax.
 
-  https://github.com/morepath/more.transaction/issues/7
 
 0.6 (2016-04-06)
 ================

more/transaction/tests/test_transaction.py

@@ -34,10 +34,6 @@ def view_document(self, request):
     def get_retry_attempts():
         return 2
 
-    import more.transaction
-    morepath.scan(more.transaction)
-    morepath.commit(TestApp)
-
     client = Client(TestApp())
     response = client.get('/document/1')
     assert response.text == 'ok'
@@ -77,10 +73,6 @@ def view_bar(self, request):
     def get_retry_attempts():
         return 2
 
-    import more.transaction
-    morepath.scan(more.transaction)
-    morepath.commit(TestApp)
-
     client = Client(TestApp())
     response = client.get('/foo/bar')
     assert response.text == 'ok'
@@ -116,10 +108,6 @@ def view_foo(self, request):
     def get_retry_attempts():
         return 2
 
-    import more.transaction
-    morepath.scan(more.transaction)
-    morepath.commit(RootApp)
-
     client = Client(RootApp())
     response = client.get('/mount/sub')
     assert response.text == 'ok'