Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #1566 from adamsc64/ticket_11857

Fixed #11857 -- Added missing 'closed' property on TemporaryFile class.

Backport of 926bc42 from trunk.
  • Loading branch information...
commit 2a2ac5c1400c67f25388621a39749c918a4efe98 1 parent 6ba01f6
@freakboy3742 freakboy3742 authored
Showing with 25 additions and 0 deletions.
  1. +1 −0  AUTHORS
  2. +9 −0 django/core/files/temp.py
  3. +15 −0 tests/files/tests.py
View
1  AUTHORS
@@ -56,6 +56,7 @@ answer newbie questions, and generally made Django that much better:
Gisle Aas <gisle@aas.no>
Chris Adams
+ Christopher Adams <christopher.r.adams@gmail.com>
Mathieu Agopian <mathieu.agopian@gmail.com>
Roberto Aguilar <roberto@baremetal.io>
ajs <adi@sieker.info>
View
9 django/core/files/temp.py
@@ -46,6 +46,15 @@ def close(self):
except (OSError):
pass
+ @property
+ def closed(self):
+ """
+ This attribute needs to be accessible in certain situations,
+ because this class is supposed to mock the API of the class
+ tempfile.NamedTemporaryFile in the Python standard library.
+ """
+ return self.file.closed
+
def __del__(self):
self.close()
View
15 tests/files/tests.py
@@ -10,6 +10,7 @@
from django.core.files.move import file_move_safe
from django.core.files.base import ContentFile
from django.core.files.uploadedfile import SimpleUploadedFile
+from django.core.files.temp import NamedTemporaryFile
from django.test import TestCase
from django.utils import unittest
from django.utils.six import StringIO
@@ -142,6 +143,20 @@ def test_context_manager(self):
self.assertTrue(f.closed)
self.assertTrue(orig_file.closed)
+ def test_namedtemporaryfile_closes(self):
+ """
+ The symbol django.core.files.NamedTemporaryFile is assigned as
+ a different class on different operating systems. In
+ any case, the result should minimally mock some of the API of
+ tempfile.NamedTemporaryFile from the Python standard library.
+ """
+ tempfile = NamedTemporaryFile()
+ self.assertTrue(hasattr(tempfile, "closed"))
+ self.assertFalse(tempfile.closed)
+
+ tempfile.close()
+ self.assertTrue(tempfile.closed)
+
def test_file_mode(self):
# Should not set mode to None if it is not present.
# See #14681, stdlib gzip module crashes if mode is set to None
Please sign in to comment.
Something went wrong with that request. Please try again.