From 50206ef212de8a6a101a47db8ab86a66165ec8a6 Mon Sep 17 00:00:00 2001 From: Massimo Di Pierro Date: Tue, 24 Apr 2012 08:38:13 -0500 Subject: [PATCH] fixed Oracle decode problem, thanks Daniel Haag --- VERSION | 2 +- gluon/dal.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index affb16e0..0d2d6928 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 1.99.7 (2012-04-23 11:26:23) dev +Version 1.99.7 (2012-04-24 08:37:24) dev diff --git a/gluon/dal.py b/gluon/dal.py index b7e704c5..54ea00ea 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -5977,6 +5977,8 @@ def bar_encode(items): return '|%s|' % '|'.join(bar_escape(item) for item in items if str(item).strip()) def bar_decode_integer(value): + if not hasattr(value,'split') and hasattr(value,'read'): + value = value.read() return [int(x) for x in value.split('|') if x.strip()] def bar_decode_string(value):