From 6c871c4536d1643725b4b5f6f1e428cbcf1fa4db Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Tue, 19 Feb 2008 11:16:49 -0800 Subject: [PATCH] * Port from SA-0.3 to SA-0.4. --- fas/fas/json.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fas/fas/json.py b/fas/fas/json.py index 85c5ed9..54531fa 100644 --- a/fas/fas/json.py +++ b/fas/fas/json.py @@ -93,8 +93,7 @@ class SABase(object): pass return props -@jsonify.when("isinstance(obj, sqlalchemy.orm.query.Query)" \ - " or isinstance(obj, sqlalchemy.ext.selectresults.SelectResults)") +@jsonify.when("isinstance(obj, sqlalchemy.orm.query.Query)") def jsonify_sa_select_results(obj): '''Transform selectresults into lists. @@ -107,7 +106,7 @@ def jsonify_sa_select_results(obj): element.jsonProps = obj.jsonProps return list(obj) -@jsonify.when("isinstance(obj, sqlalchemy.orm.attributes.InstrumentedList)") +@jsonify.when("isinstance(obj, sqlalchemy.orm.attributes.InstrumentedAttribute)") def jsonify_salist(obj): '''Transform SQLAlchemy InstrumentedLists into json.