dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michele Comitini
2013-07-22 23:27:35 +02:00
parent d2ade8afb1 44985f0076
commit f52b7def1d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -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
+3 -3
View File
@@ -4324,10 +4324,10 @@ class DatabaseStoredFile:
try: try:
if db.executesql(query): if db.executesql(query):
return True return True
except IOError, e: except Exception:
# no web2py_filesystem found? # no web2py_filesystem found?
LOGGER.error("Could not retrieve %s. %s" % (filename, e)) tb = traceback.format_exc()
pass LOGGER.error("Could not retrieve %s\n%s" % (filename, tb))
return False return False
gluon/validators.py
+2 -2
View File
@@ -355,10 +355,10 @@ class IS_JSON(Validator):
return None return None
try: try:
if self.native_json: if self.native_json:
simplejson.dumps(value) # raises error in case of malformed json simplejson.loads(value) # raises error in case of malformed json
return (value, None) # the serialized value is not passed return (value, None) # the serialized value is not passed
return (simplejson.loads(value), None) return (simplejson.loads(value), None)
except JSONErrors: except JSONErrors, e:
return (value, translate(self.error_message)) return (value, translate(self.error_message))
def formatter(self,value): def formatter(self,value):