summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/quick_tutorial/databases/tutorial/models.py8
-rw-r--r--docs/whatsnew-2.0.rst2
2 files changed, 5 insertions, 5 deletions
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
diff --git a/docs/whatsnew-2.0.rst b/docs/whatsnew-2.0.rst
index bf1554a27..ec506894e 100644
--- a/docs/whatsnew-2.0.rst
+++ b/docs/whatsnew-2.0.rst
@@ -56,7 +56,7 @@ flexibility in authorization implementations, especially those that do not
match the ACL pattern. If you were previously using
:class:`pyramid.authorization.ACLAuthorizationPolicy`, you can achieve the same
results by writing your own ``permits`` method using
-:class:`pyraid.authorization.ACLHelper`. For more details on implementing an
+:class:`pyramid.authorization.ACLHelper`. For more details on implementing an
ACL, see :ref:`assigning_acls`.
Pyramid does not provide any built-in security policies. Similiar