From 6868ddeed5134b69d3c247c5878c24cdc90a7cd3 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Mon, 18 Nov 2013 15:41:32 -0600 Subject: [PATCH] fixed 1779:Query class __str__ method should cast non string values, thanks Alan --- VERSION | 2 +- gluon/dal.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 03ff53f4..76240630 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.7.4-stable+timestamp.2013.11.18.15.36.55 +Version 2.7.4-stable+timestamp.2013.11.18.15.40.40 diff --git a/gluon/dal.py b/gluon/dal.py index a9e4a832..413ccff5 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -10037,7 +10037,7 @@ class Query(object): return '' % BaseAdapter.expand(self.db._adapter,self) def __str__(self): - return self.db._adapter.expand(self) + return str(self.db._adapter.expand(self)) def __and__(self, other): return Query(self.db,self.db._adapter.AND,self,other)