From 8d8095b1f50abb125cd0a8a201de45501b79535b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonel=20C=C3=A2mara?= <leonelcamara@gmail.com>
Date: Tue, 29 Jul 2014 19:39:12 +0100
Subject: [PATCH] Added fix - you cannot concatenate lists with tuples and sets
 and it was possible that this would happen

---
 gluon/dal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gluon/dal.py b/gluon/dal.py
index 5e633a79..a7e624e2 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -7421,7 +7421,7 @@ class Row(object):
     def as_dict(self, datetime_to_str=False, custom_types=None):
         SERIALIZABLE_TYPES = [str, unicode, int, long, float, bool, list, dict]
         if isinstance(custom_types,(list,tuple,set)):
-            SERIALIZABLE_TYPES += custom_types
+            SERIALIZABLE_TYPES += list(custom_types)
         elif custom_types:
             SERIALIZABLE_TYPES.append(custom_types)
         d = dict(self)