From 917e4c6d775a9bc92efe4aa205f3a535ed826c12 Mon Sep 17 00:00:00 2001 From: kindly Date: Thu, 9 Jan 2014 11:46:30 +0000 Subject: [PATCH] [#1427] add contitional to allow 0.8 sqlalchemy --- ckan/lib/dictization/__init__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ckan/lib/dictization/__init__.py b/ckan/lib/dictization/__init__.py index 6f726ad3436..5c9f77346d1 100644 --- a/ckan/lib/dictization/__init__.py +++ b/ckan/lib/dictization/__init__.py @@ -3,6 +3,12 @@ import sqlalchemy from pylons import config +try: + RowProxy = sqlalchemy.engine.result.RowProxy +except AttributeError: + RowProxy = sqlalchemy.engine.base.RowProxy + + # NOTE # The functions in this file contain very generic methods for dictizing objects # and saving dictized objects. If a specialised use is needed please do NOT extend @@ -17,7 +23,7 @@ def table_dictize(obj, context, **kw): model = context["model"] session = model.Session - if isinstance(obj, sqlalchemy.engine.base.RowProxy): + if isinstance(obj, RowProxy): fields = obj.keys() else: ModelClass = obj.__class__