Permalink
Browse files

- 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.
  • Loading branch information...
1 parent 9a064ea commit aec6b29b42ad2acf0c9febd884ae9db1316022c5 @mcdonc mcdonc committed Jul 12, 2011
View
@@ -30,6 +30,17 @@ Bug Fixes
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)
==================
View
@@ -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
-----------
@@ -41,7 +41,7 @@ def initialize_sql(engine):
transaction.commit()
except IntegrityError:
# already created
- pass
+ transaction.abort()
class RootFactory(object):
__acl__ = [ (Allow, Everyone, 'view'),
@@ -40,4 +40,4 @@ def initialize_sql(engine):
try:
populate()
except IntegrityError:
- pass
+ transaction.abort()
@@ -39,4 +39,4 @@ def initialize_sql(engine):
transaction.commit()
except IntegrityError:
# already created
- pass
+ transaction.abort()
@@ -41,7 +41,7 @@ def initialize_sql(engine):
transaction.commit()
except IntegrityError:
# already created
- pass
+ transaction.abort()
class RootFactory(object):
__acl__ = [ (Allow, Everyone, 'view'),
@@ -38,4 +38,4 @@ def initialize_sql(engine):
transaction.commit()
except IntegrityError:
# already created
- pass
+ transaction.abort()
@@ -76,7 +76,7 @@ def initialize_sql(engine):
try:
populate()
except IntegrityError:
- DBSession.rollback()
+ transaction.abort()
return DBSession
def appmaker(engine):
@@ -39,4 +39,4 @@ def initialize_sql(engine):
try:
populate()
except IntegrityError:
- DBSession.rollback()
+ transaction.abort()

0 comments on commit aec6b29

Please sign in to comment.