diff --git a/VERSION b/VERSION index 3b730039..a1cbb5d2 100644 --- a/VERSION +++ b/VERSION @@ -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 diff --git a/gluon/dal.py b/gluon/dal.py index 2d084937..06083b31 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -9262,8 +9262,9 @@ class Field(Expression): stream = self.uploadfs.open(name, 'rb') else: # ## if file is on regular filesystem - fullname = pjoin(file_properties['path'], name) - stream = open(fullname,'rb') + # this is intentially a sting with filename and not a stream + # this propagates and allows stream_file_or_304_or_206 to be called + stream = pjoin(file_properties['path'], name) return (filename, stream) def retrieve_file_properties(self, name, path=None):