* Port from SA-0.3 to SA-0.4.

This commit is contained in:
Toshio Kuratomi 2008-02-19 11:16:49 -08:00
parent d78e862657
commit 6c871c4536

View file

@ -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.