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

possible fix for issue 188, thanks Marin

Browse Source
This commit is contained in:
mdipierro
2012-07-30 16:25:35 -05:00
parent e912f1084c
commit bac7e433c6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-07-29 21:55:47) dev Version 2.00.0 (2012-07-30 16:25:32) dev
gluon/sqlhtml.py
+3 -3
View File
@@ -1229,6 +1229,7 @@ class SQLFORM(FORM):
continue # do not update if password was not changed continue # do not update if password was not changed
elif field.type == 'upload': elif field.type == 'upload':
f = self.vars[fieldname] f = self.vars[fieldname]
f = f or self.table[fieldname].default or f
fd = '%s__delete' % fieldname fd = '%s__delete' % fieldname
if f == '' or f is None: if f == '' or f is None:
if self.vars.get(fd, False) or not self.record: if self.vars.get(fd, False) or not self.record:
@@ -1240,9 +1241,8 @@ class SQLFORM(FORM):
elif hasattr(f, 'file'): elif hasattr(f, 'file'):
(source_file, original_filename) = (f.file, f.filename) (source_file, original_filename) = (f.file, f.filename)
elif isinstance(f, (str, unicode)): elif isinstance(f, (str, unicode)):
### do not know why this happens, it should not # warning: possible IOError exception
(source_file, original_filename) = \ (source_file, original_filename) = (open(f, 'rb'), f)
(cStringIO.StringIO(f), 'file.txt')
newfilename = field.store(source_file, original_filename, newfilename = field.store(source_file, original_filename,
field.uploadfolder) field.uploadfolder)
# this line is for backward compatibility only # this line is for backward compatibility only