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

2013-03-08 12:06:05 -06:00
parent da25c6f843
commit 1c8ce00657
2 changed files with 4 additions and 3 deletions
@@ -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
@@ -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):