- The ``pyramid_routesalchemy`` and ``pyramid_alchemy`` scaffolds inappro...

Chris McDonough

2011-07-13 aec6b29b42ad2acf0c9febd884ae9db1316022c5

- The ``pyramid_routesalchemy`` and ``pyramid_alchemy`` scaffolds
  inappropriately used ``DBSession.rollback()`` instead of
  ``transaction.abort()`` in one place.

- Wiki2 (SQLAlchemy + URL Dispatch) tutorial ``models.initialize_sql`` didn't
  match the ``pyramid_routesalchemy`` scaffold function of the same name; it
  didn't get synchronized when it was changed in the scaffold.

 CHANGES.txt

@@ -30,6 +30,17 @@
  second route with the name of a previously added name or c) use a
  Configurator that works in ``autocommit`` mode.

- The ``pyramid_routesalchemy`` and ``pyramid_alchemy`` scaffolds
  inappropriately used ``DBSession.rollback()`` instead of
  ``transaction.abort()`` in one place.

Documentation
-------------

- Wiki2 (SQLAlchemy + URL Dispatch) tutorial ``models.initialize_sql`` didn't
  match the ``pyramid_routesalchemy`` scaffold function of the same name; it
  didn't get synchronized when it was changed in the scaffold.

1.1b1 (2011-07-10)
==================


 TODO.txt

@@ -1,13 +1,6 @@
Pyramid TODOs
=============

Must-Have
---------

- tutorial models.initialize_sql doesn't match scaffold
  (DBSession.rollback()/transaction.abort() in scaffold vs. "pass" in
  tutorial)

Should-Have
-----------


 docs/tutorials/wiki2/src/authorization/tutorial/models.py

@@ -41,7 +41,7 @@
        transaction.commit()
    except IntegrityError:
        # already created
        pass
        transaction.abort()

class RootFactory(object):
    __acl__ = [ (Allow, Everyone, 'view'),

 docs/tutorials/wiki2/src/basiclayout/tutorial/models.py

@@ -40,4 +40,4 @@
    try:
        populate()
    except IntegrityError:
        pass
        transaction.abort()

 docs/tutorials/wiki2/src/models/tutorial/models.py

@@ -39,4 +39,4 @@
        transaction.commit()
    except IntegrityError:
        # already created
        pass
        transaction.abort()

 docs/tutorials/wiki2/src/tests/tutorial/models.py

@@ -41,7 +41,7 @@
        transaction.commit()
    except IntegrityError:
        # already created
        pass
        transaction.abort()

class RootFactory(object):
    __acl__ = [ (Allow, Everyone, 'view'),

 docs/tutorials/wiki2/src/views/tutorial/models.py

@@ -38,4 +38,4 @@
        transaction.commit()
    except IntegrityError:
        # already created
        pass
        transaction.abort()

 pyramid/scaffolds/alchemy/+package+/models.py

@@ -76,7 +76,7 @@
    try:
        populate()
    except IntegrityError:
        DBSession.rollback()
        transaction.abort()
    return DBSession

def appmaker(engine):

 pyramid/scaffolds/routesalchemy/+package+/models.py

@@ -39,4 +39,4 @@
    try:
        populate()
    except IntegrityError:
        DBSession.rollback()
        transaction.abort()