Changeset 5074

Timestamp:

08/02/08 13:00:33 (5 months ago)

Author:

alberto

Message:

integrated repoze.tm. warning: breaking changes, read an email I'll post at turobogears-trunk for more details (google repoze.tm if reading this somewhen in the future)

Files:

• trunk/setup.py (modified) (2 diffs)
• trunk/tg/config.py (modified) (4 diffs)

trunk/setup.py

@@ -18 +18 @@
-    include_package_data=True,
-    zip_safe=False,
+    dependency_links=[
+        'http://turbogears.org/2.0/downloads/current',
+    ],
-    install_requires=[
-        'Babel',
@@ -23 +26 @@
-        'Pylons>=0.9.7beta3',
-        'ToscaWidgets>=0.9', 
+        'repoze.tm',
-    ],
-    extras_require={

trunk/tg/config.py

@@ -1 +1 @@
-"""Simple AppSetup helper class"""
-import os
+import logging
-from pylons.i18n import ugettext
-from genshi.filters import Translator
@@ -19 +20 @@
-
-from tw.api import make_middleware as tw_middleware
+
+log = logging.getLogger(__name__)
-
-class Bunch(dict):
@@ -242 +245 @@
-        return app
-
+    def commit_veto(self, environ, status, headers):
+        """
+        This hook is called by repoze.tm in case we want to veto a commit
+        for some reason. Return True to force a rollback.
+
+        By default we veto if the response's status code is an error code.
+        Override this method, or monkey patch the instancemethod, to fine
+        tune this behaviour.
+        """
+        return not (200 <= int(status.split()[0]) < 400)
+
+    def add_tm_middleware(self, app):
+        from repoze.tm import make_tm
+        return make_tm(app, self.commit_veto)
+
+    def add_dbsession_remover_middleware(self, app):
+        def remover(environ, start_response):
+            try:
+                return app(environ, start_response)
+            finally:
+                log.debug("Removing DBSession from current thread")
+                self.DBSession.remove()
+        return remover
+
-    def setup_tg_wsgi_app(self, load_environment):
-        """Create a base TG app, with all the standard middleware
@@ -282 +309 @@
-                app = self.add_auth_middleware(app)
-
+            app = self.add_tm_middleware(app)
+            if self.use_sqlalchemy:
+                app = self.add_dbsession_remover_middleware(app)
+
-            if asbool(full_stack):
-                # This should nevery be true for internal nested apps