Control: tags 718149 + patch pending Hi!
I have uploaded an NMU to the 3-day delayed queue, including a fix for this problem. I have also committed these changes to the collab-maint git repo. I'm attaching the debdiff with the change. I think it's important to mention that turbojson seems to be completely dead upstream. I couldn't find the source code nor the bug tracker in the turbogears repo. And the latest release was on 2011-08-07. I'm under the impression that they are no longer maintaining that. -- Regards, Marga
diff -Nru turbojson-1.3.2/debian/changelog turbojson-1.3.2/debian/changelog --- turbojson-1.3.2/debian/changelog 2012-05-29 21:14:21.000000000 +0000 +++ turbojson-1.3.2/debian/changelog 2013-11-24 16:27:07.000000000 +0000 @@ -1,3 +1,12 @@ +turbojson (1.3.2-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix jsonify to support sqlalchemy 0.8. (Closes: #718149). + * Update Standards-Version to 3.9.5 + * Remove DM-Upload-Allowed, as this is now obsolete. + + -- Margarita Manterola <[email protected]> Sun, 24 Nov 2013 17:26:58 +0100 + turbojson (1.3.2-2) unstable; urgency=low * Unit testing enabled on every Python version diff -Nru turbojson-1.3.2/debian/control turbojson-1.3.2/debian/control --- turbojson-1.3.2/debian/control 2012-05-29 21:14:21.000000000 +0000 +++ turbojson-1.3.2/debian/control 2013-11-24 16:27:07.000000000 +0000 @@ -2,7 +2,6 @@ Section: python Priority: optional Maintainer: Federico Ceratto <[email protected]> -DM-Upload-Allowed: yes Build-Depends: debhelper (>= 8.0.0~), python-all (>= 2.6.6-3~), diff -Nru turbojson-1.3.2/debian/patches/series turbojson-1.3.2/debian/patches/series --- turbojson-1.3.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ turbojson-1.3.2/debian/patches/series 2013-11-24 16:27:07.000000000 +0000 @@ -0,0 +1 @@ +support-sqlalchemy-0.8 diff -Nru turbojson-1.3.2/debian/patches/support-sqlalchemy-0.8 turbojson-1.3.2/debian/patches/support-sqlalchemy-0.8 --- turbojson-1.3.2/debian/patches/support-sqlalchemy-0.8 1970-01-01 00:00:00.000000000 +0000 +++ turbojson-1.3.2/debian/patches/support-sqlalchemy-0.8 2013-11-24 16:27:07.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Add support for SQLAlchemy 0.8 +Author: Margarita Manterola <[email protected]> +Index: turbojson/turbojson/jsonify.py +=================================================================== +--- turbojson.orig/turbojson/jsonify.py 2013-11-24 16:55:58.466672501 +0100 ++++ turbojson/turbojson/jsonify.py 2013-11-24 16:56:42.450890608 +0100 +@@ -172,7 +172,11 @@ + """JSONify SQLAlchemy instrumented lists.""" + return list(obj) + +- from sqlalchemy.engine.base import ResultProxy, RowProxy ++ try: ++ from sqlalchemy.engine.base import ResultProxy, RowProxy ++ except ImportError: ++ # SQLAlchemy >= 0.8 ++ from sqlalchemy.engine.result import ResultProxy, RowProxy + + @jsonify_default.when("isinstance(obj, ResultProxy)") + def jsonify_saproxy(obj):
