diff --git a/tests/file_uploads/views.py b/tests/file_uploads/views.py index c4166087ac..789cc2a365 100644 --- a/tests/file_uploads/views.py +++ b/tests/file_uploads/views.py @@ -1,4 +1,3 @@ -import contextlib import hashlib import json import os @@ -98,7 +97,7 @@ def file_upload_echo_content(request): Simple view to echo back the content of uploaded files for tests. """ def read_and_close(f): - with contextlib.closing(f): + with f: return f.read().decode('utf-8') r = {k: read_and_close(f) for k, f in request.FILES.items()} return HttpResponse(json.dumps(r)) diff --git a/tests/servers/tests.py b/tests/servers/tests.py index 8f7e3253e7..bf87306cce 100644 --- a/tests/servers/tests.py +++ b/tests/servers/tests.py @@ -1,7 +1,6 @@ """ Tests for django.core.servers. """ -import contextlib import errno import os import socket @@ -58,11 +57,11 @@ class LiveServerViews(LiveServerBase): self.assertEqual(err.exception.code, 404, 'Expected 404 response') def test_view(self): - with contextlib.closing(self.urlopen('/example_view/')) as f: + with self.urlopen('/example_view/') as f: self.assertEqual(f.read(), b'example view') def test_static_files(self): - with contextlib.closing(self.urlopen('/static/example_static_file.txt')) as f: + with self.urlopen('/static/example_static_file.txt') as f: self.assertEqual(f.read().rstrip(b'\r\n'), b'example static file') def test_no_collectstatic_emulation(self): @@ -76,11 +75,11 @@ class LiveServerViews(LiveServerBase): self.assertEqual(err.exception.code, 404, 'Expected 404 response') def test_media_files(self): - with contextlib.closing(self.urlopen('/media/example_media_file.txt')) as f: + with self.urlopen('/media/example_media_file.txt') as f: self.assertEqual(f.read().rstrip(b'\r\n'), b'example media file') def test_environ(self): - with contextlib.closing(self.urlopen('/environ_view/?%s' % urlencode({'q': 'тест'}))) as f: + with self.urlopen('/environ_view/?%s' % urlencode({'q': 'тест'})) as f: self.assertIn(b"QUERY_STRING: 'q=%D1%82%D0%B5%D1%81%D1%82'", f.read()) @@ -90,7 +89,7 @@ class LiveServerDatabase(LiveServerBase): """ Fixtures are properly loaded and visible to the live server thread. """ - with contextlib.closing(self.urlopen('/model_view/')) as f: + with self.urlopen('/model_view/') as f: self.assertEqual(f.read().splitlines(), [b'jane', b'robert']) def test_database_writes(self): diff --git a/tests/staticfiles_tests/test_liveserver.py b/tests/staticfiles_tests/test_liveserver.py index b3727bea12..717de5cf64 100644 --- a/tests/staticfiles_tests/test_liveserver.py +++ b/tests/staticfiles_tests/test_liveserver.py @@ -4,7 +4,6 @@ django.contrib.staticfiles.testing.StaticLiveServerTestCase instead of django.test.LiveServerTestCase. """ -import contextlib import os from urllib.request import urlopen @@ -86,5 +85,5 @@ class StaticLiveServerView(LiveServerBase): StaticLiveServerTestCase use of staticfiles' serve() allows it to discover app's static assets without having to collectstatic first. """ - with contextlib.closing(self.urlopen('/static/test/file.txt')) as f: + with self.urlopen('/static/test/file.txt') as f: self.assertEqual(f.read().rstrip(b'\r\n'), b'In static directory.')