mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-03 10:34:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Refs #23919 -- Removed obsolete contextlib.closing() calls (for Python 2).

Browse source
This commit is contained in:
Tim Graham 2017-01-19 08:50:28 -05:00 • committed by GitHub
parent 7d20094996
commit 5320fa77c3
3 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tests/servers/tests.py
View file

@ -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):