summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2019-11-11 10:49:46 -0800
committerGitHub <noreply@github.com>2019-11-11 10:49:46 -0800
commitb30710e83cf89aab92f64f5535ce0fcb560a787c (patch)
tree535581b37c7e868b186a51509ace7fcd96e65b50
parente6596143be10ee629f97f1c95b02073f76f65986 (diff)
parent85a98147d4098593b7ff6781a140ddea6a0b523f (diff)
downloadpyramid-b30710e83cf89aab92f64f5535ce0fcb560a787c.tar.gz
pyramid-b30710e83cf89aab92f64f5535ce0fcb560a787c.tar.bz2
pyramid-b30710e83cf89aab92f64f5535ce0fcb560a787c.zip
Merge pull request #3529 from danduk82/patch_tutorial
replace ZopeTransactionExtension with zope.sqlalchemy.register
-rw-r--r--CONTRIBUTORS.txt2
-rw-r--r--docs/quick_tutorial/databases/tutorial/models.py8
2 files changed, 6 insertions, 4 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index f41e5fdb5..65be5e259 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -348,3 +348,5 @@ Contributors
- Jonathan Vanasco, 2019/11/05
- Jan Likar, 2019/11/07
+
+- Andrea Borghi, 2019/11/11
diff --git a/docs/quick_tutorial/databases/tutorial/models.py b/docs/quick_tutorial/databases/tutorial/models.py
index b27c38417..8e6649d49 100644
--- a/docs/quick_tutorial/databases/tutorial/models.py
+++ b/docs/quick_tutorial/databases/tutorial/models.py
@@ -13,10 +13,10 @@ from sqlalchemy.orm import (
sessionmaker,
)
-from zope.sqlalchemy import ZopeTransactionExtension
+from zope.sqlalchemy import register
-DBSession = scoped_session(
- sessionmaker(extension=ZopeTransactionExtension()))
+DBSession = scoped_session(sessionmaker())
+register(DBSession)
Base = declarative_base()
@@ -32,4 +32,4 @@ class Root(object):
(Allow, 'group:editors', 'edit')]
def __init__(self, request):
- pass \ No newline at end of file
+ pass