From bf3770dc9806e0fae63c2642915013884aee9cc2 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 9 Jun 2013 16:43:49 -0500 Subject: [PATCH] fixed Issue 1520:incomplete fix for json and csv import --- VERSION | 2 +- gluon/dal.py | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/VERSION b/VERSION index 87d0cfb9..289cf9f3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.5.1-stable+timestamp.2013.06.09.16.41.01 +Version 2.5.1-stable+timestamp.2013.06.09.16.43.01 diff --git a/gluon/dal.py b/gluon/dal.py index b08cf609..7bac15de 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -8675,12 +8675,6 @@ class Table(object): value = None elif field.type=='blob': value = base64.b64decode(value) - elif field.type=='json': - try: - json = serializers.json - value = json(value) - except TypeError: - pass elif field.type=='double' or field.type=='float': if not value.strip(): value = None