Fixed a few ResourceWarnings.

Author: apollo13

tests/modeltests/files/tests.py

@@ -108,14 +108,12 @@ def test_file_object(self):
  temp_storage.save('tests/example.txt', ContentFile('some content'))
 
  # Load it as python file object
- file_obj = open(temp_storage.path('tests/example.txt'))
-
- # Save it using storage and read its content
- temp_storage.save('tests/file_obj', file_obj)
+ with open(temp_storage.path('tests/example.txt')) as file_obj:
+ # Save it using storage and read its content
+ temp_storage.save('tests/file_obj', file_obj)
  self.assertTrue(temp_storage.exists('tests/file_obj'))
- self.assertEqual(
- temp_storage.open('tests/file_obj').read(),
- b'some content')
+ with temp_storage.open('tests/file_obj') as f:
+ self.assertEqual(f.read(), b'some content')
 
 
  def test_stringio(self):
@@ -127,9 +125,8 @@ def test_stringio(self):
  # Save it and read written file
  temp_storage.save('tests/stringio', output)
  self.assertTrue(temp_storage.exists('tests/stringio'))
- self.assertEqual(
- temp_storage.open('tests/stringio').read(),
- b'content')
+ with temp_storage.open('tests/stringio') as f:
+ self.assertEqual(f.read(), b'content')
 
 
 

tests/regressiontests/file_storage/tests.py

@@ -639,7 +639,7 @@ def test_urllib2_urlopen(self):
  f = File(file_like_object)
  stored_filename = self.storage.save("remote_file.html", f)
 
- stored_file = self.storage.open(stored_filename)
  remote_file = self.urlopen('/example_view/')
 
- self.assertEqual(stored_file.read(), remote_file.read())
+ with self.storage.open(stored_filename) as stored_file:
+ self.assertEqual(stored_file.read(), remote_file.read())

tests/runtests.py

@@ -4,7 +4,6 @@
 import subprocess
 import sys
 import tempfile
-import warnings
 
 from django import contrib
 from django.utils._os import upath