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

reverted recent change to retrieve, thanks Anthony for pointing out why the original correct is better than the 'fixed' one

Browse Source
This commit is contained in:
Massimo
2013-03-08 12:06:05 -06:00
parent da25c6f843
commit 1c8ce00657
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.4.2-stable+timestamp.2013.03.08.10.18.44 Version 2.4.2-stable+timestamp.2013.03.08.12.05.24
gluon/dal.py
+3 -2
View File
@@ -9262,8 +9262,9 @@ class Field(Expression):
stream = self.uploadfs.open(name, 'rb') stream = self.uploadfs.open(name, 'rb')
else: else:
# ## if file is on regular filesystem # ## if file is on regular filesystem
fullname = pjoin(file_properties['path'], name) # this is intentially a sting with filename and not a stream
stream = open(fullname,'rb') # this propagates and allows stream_file_or_304_or_206 to be called
stream = pjoin(file_properties['path'], name)
return (filename, stream) return (filename, stream)
def retrieve_file_properties(self, name, path=None): def retrieve_file_properties(self, name, path=None):