Commit 918a16bc authored by Hans Lawrenz's avatar Hans Lawrenz Committed by Baptiste Mispelon
Browse files

Fixed #22307 -- Fixed SpooledTemporaryFile bug in File class. 

Added condition to prevent checking the existence of a file name of a
file like object when the name attribute is None. This is necessary
because a SpooledTemporaryFile won't exist on the file system or have a
name until it has reached its max_size. Also added tests.
parent 7e0f9095

django/core/files/base.py

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ class File(FileProxyMixin): 
        if not hasattr(self, '_size'):

            if hasattr(self.file, 'size'):

                self._size = self.file.size

            elif hasattr(self.file, 'name') and os.path.exists(self.file.name):

            elif hasattr(self.file, 'name') and self.file.name is not None and os.path.exists(self.file.name):

                self._size = os.path.getsize(self.file.name)

            elif hasattr(self.file, 'tell') and hasattr(self.file, 'seek'):

                pos = self.file.tell()

tests/files/tests.py

+14 −0
Original line number Diff line number Diff line
@@ -205,3 +205,17 @@ class FileMoveSafeTests(unittest.TestCase): 


        os.close(handle_a)

        os.close(handle_b)





class SpooledTempTests(unittest.TestCase):

    def test_in_memory_spooled_temp(self):

        with tempfile.SpooledTemporaryFile() as temp:

            temp.write(b"foo bar baz quux\n")

            django_file = File(temp, name="something.txt")

            self.assertEqual(django_file.size, 17)



    def test_written_spooled_temp(self):

        with tempfile.SpooledTemporaryFile(max_size=4) as temp:

            temp.write(b"foo bar baz quux\n")

            django_file = File(temp, name="something.txt")

            self.assertEqual(django_file.size, 17)