Resolve SQLAlchemy deprecation warnings

tests/test_stack/rendering/test_pagination.py

@@ -256,7 +256,7 @@ def setup_class(self):
         self.s = SQLASession(connection)
 
     def test_relationship(self):
-        t = self.s.query(MTest1).get(1)
+        t = self.s.get(MTest1, 1)
         p = Page(t.test2s, items_per_page=1, page=1)
         assert len(list(p)) == 1
         assert list(p)[0].val == 'fred', list(p)

tests/test_stack/test_registry.py

@@ -403,7 +403,8 @@ def app(environ, start_response):
 
     try:
         next(resp)
-    except:
+        next(resp)
+    except AssertionError:
         # Looping again will crash because we already popped
         # The registered object and cleanup will fail.
         pass

tests/test_util.py

@@ -362,7 +362,7 @@ class Test(object):
             connection.execute(testtable.insert(), {'id': 3, 'val': 'alberto'})
 
             sess = Session(connection)
-            getunless = unless(sess.query(Test).get)
+            getunless = unless(lambda x: sess.get(Test, x))
 
             x = getunless(1)
             assert x.val == 'bob', x

tg/util/misc.py

@@ -13,7 +13,7 @@ def unless(func, check=None):
     to fail validation when querying objects from the database
     if they do not exist::
 
-        Convert(unless(DBSession.query(User).get))
+        Convert(unless(lambda uid: DBSession.get(User, uid)))
 
     """
     @wraps(func)