summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2014-04-17 15:07:35 -0500
committerMichael Merickel <michael@merickel.org>2014-04-17 15:07:35 -0500
commitf8839afda7649a9f7ebc4cc5f6ae4743012f2230 (patch)
treeea7f2ad4067bcae184c8393e62d1ef53eca0ad1e /docs
parentb666df0d5f299eca20e9370ac43cddee71b6dd06 (diff)
parent2af00e59d9c3e19b25e2759832efe6485a617536 (diff)
downloadpyramid-f8839afda7649a9f7ebc4cc5f6ae4743012f2230.tar.gz
pyramid-f8839afda7649a9f7ebc4cc5f6ae4743012f2230.tar.bz2
pyramid-f8839afda7649a9f7ebc4cc5f6ae4743012f2230.zip
Merge pull request #1303 from flibustenet/patch-2
More explicit example of set_property
Diffstat (limited to 'docs')
-rw-r--r--docs/api/request.rst8
1 files changed, 7 insertions, 1 deletions
diff --git a/docs/api/request.rst b/docs/api/request.rst
index 343d0c022..c52d41400 100644
--- a/docs/api/request.rst
+++ b/docs/api/request.rst
@@ -319,7 +319,13 @@
def _connect(request):
conn = request.registry.dbsession()
- def cleanup(_):
+ def cleanup(request):
+ # since version 1.5 request.exception is not more
+ # eagerly cleared
+ if request.exception is not None:
+ conn.rollback()
+ else:
+ conn.commit()
conn.close()
request.add_finished_callback(cleanup)
return conn