iro/model/pool.py
branchdevel
changeset 151 ff8448fb07e7
parent 132 80a334e2aae7
child 258 0a5eb5aac0be
--- a/iro/model/pool.py	Mon Feb 13 18:00:27 2012 +0100
+++ b/iro/model/pool.py	Mon Feb 13 19:50:01 2012 +0100
@@ -1,5 +1,5 @@
 from decorator import decorator
-
+import sqlalchemy
 class Data:
     def __init__(self):
         self.pool =  None
@@ -13,6 +13,9 @@
 @decorator
 def runInDBPool(f,*args,**kwargs):
     """Decorator to run DB queries in Twisted's thread pool"""
-    return data.pool.run(f, *args, **kwargs)
+    if isinstance(args[-1],sqlalchemy.orm.session.Session):
+        return f(*args,**kwargs)
+    else:
+        return data.pool.run(f, *args, **kwargs)