From 2a2ac5c1400c67f25388621a39749c918a4efe98 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Fri, 6 Sep 2013 17:38:37 -0700
Subject: [PATCH] Merge pull request #1566 from adamsc64/ticket_11857

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

Backport of 926bc42 from trunk.
---
 AUTHORS                   |  1 +
 django/core/files/temp.py |  9 +++++++++
 tests/files/tests.py      | 15 +++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 2a81278658d..8ac28102a1d 100644
--- a/AUTHORS
+++ b/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>
diff --git a/django/core/files/temp.py b/django/core/files/temp.py
index b6072912945..3dcda17a09d 100644
--- a/django/core/files/temp.py
+++ b/django/core/files/temp.py
@@ -46,6 +46,15 @@ if os.name == 'nt':
                 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()
 
diff --git a/tests/files/tests.py b/tests/files/tests.py
index f1e3d5b14bb..79d5e97164c 100644
--- a/tests/files/tests.py
+++ b/tests/files/tests.py
@@ -10,6 +10,7 @@ from django.core.files import File
 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 @@ class FileTests(unittest.TestCase):
         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