Merge ssh://github.com/web2py/web2py into native_json_local_check

VERSION

@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.07.22.04.48.04
+Version 2.6.0-development+timestamp.2013.07.22.14.51.29

gluon/dal.py

@@ -4324,10 +4324,10 @@ class DatabaseStoredFile:
         try:
             if db.executesql(query):
                 return True
-        except IOError, e:
+        except Exception:
             # no web2py_filesystem found?
-            LOGGER.error("Could not retrieve %s. %s" % (filename, e))
-            pass
+            tb = traceback.format_exc()
+            LOGGER.error("Could not retrieve %s\n%s" % (filename, tb))
         return False
 
 

gluon/validators.py

@@ -359,7 +359,7 @@ class IS_JSON(Validator):
                 return (value, None) #  the serialized value is not passed
             return (simplejson.loads(value), None)
         except JSONErrors, e:
-            return (value, translate(self.error_message) + ': '+ e.message)
+            return (value, translate(self.error_message))
 
     def formatter(self,value):
         if value is None: