[python-turbojson] Fix problem when using with SQLAlchemy 0.8

[Toshio くらとみ]

commit c938cb0f84f52a5fb5394621cf67c0a21cca6e1d
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Fri Feb 22 11:00:01 2013 -0800

    Fix problem when using with SQLAlchemy 0.8

 python-turbojson.spec         |    7 ++++++-
 turbojson-sqalchemy-0.8.patch |   18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/python-turbojson.spec b/python-turbojson.spec
index 8f56412..50e2c29 100644
--- a/python-turbojson.spec
+++ b/python-turbojson.spec
@@ -6,13 +6,14 @@
 
 Name:           python-turbojson
 Version:        1.3.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Python template plugin that supports json
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://cheeseshop.python.org/pypi/TurboJson
 Source0:        http://pypi.python.org/packages/source/T/TurboJson/TurboJson-%{version}.tar.gz
+Patch0: turbojson-sqalchemy-0.8.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -36,6 +37,7 @@ that support python.templating.engines.
 
 %prep
 %setup -q -n TurboJson-%{version}
+%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -59,6 +61,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Feb 22 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 1.3.2-5
+- Fix problem when using with SQLAlchemy 0.8
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/turbojson-sqalchemy-0.8.patch b/turbojson-sqalchemy-0.8.patch
new file mode 100644
index 0000000..26e3735
--- /dev/null
+++ b/turbojson-sqalchemy-0.8.patch
@@ -0,0 +1,18 @@
+Index: TurboJson-1.3.2/turbojson/jsonify.py
+===================================================================
+--- TurboJson-1.3.2.orig/turbojson/jsonify.py
++++ TurboJson-1.3.2/turbojson/jsonify.py
+@@ -172,7 +172,12 @@ try:
+                 """JSONify SQLAlchemy instrumented lists."""
+                 return list(obj)
+ 
+-    from sqlalchemy.engine.base import ResultProxy, RowProxy
++    try:
++        # SQLAlchemy >= 0.8
++        from sqlalchemy.engine.result import ResultProxy, RowProxy
++    except ImportError:
++        # SQLAlchemy < 0.8
++        from sqlalchemy.engine.base import ResultProxy, RowProxy
+ 
+     @jsonify_default.when("isinstance(obj, ResultProxy)")
+     def jsonify_saproxy(obj):