Ticket #14749: enter_exit_for_file.diff

django/core/files/base.py

@@ -101 +101 @@
         if buffer_ is not None:
             yield buffer_
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, type, value, traceback):
+        self.close()
+
     def open(self, mode=None):
         if not self.closed:
             self.seek(0)

tests/regressiontests/file_storage/tests.py

@@ -111 +111 @@
         self.storage.delete('storage_test')
         self.failIf(self.storage.exists('storage_test'))
 
+    def test_file_context_managers(self):
+        """
+        Using __enter__ and __exit__ works as expected.
+        """
+        orig_file = tempfile.TemporaryFile()
+        with File(orig_file) as f:
+            self.assertTrue(isinstance(f, File))
+            self.assertFalse(f.closed)
+        self.assertTrue(f.closed)
+
     def test_file_accessed_time(self):
         """
         File storage returns a Datetime object for the last accessed time of