diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | tests/regressiontests/servers/tests.py | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -347,6 +347,7 @@ answer newbie questions, and generally made Django that much better: Frantisek Malina <vizualbod@vizualbod.com> Mike Malone <mjmalone@gmail.com> Martin Maney <http://www.chipy.org/Martin_Maney> + Michael Manfre <mmanfre@gmail.com> masonsimon+django@gmail.com Manuzhai Petr Marhoun <petr.marhoun@gmail.com> diff --git a/tests/regressiontests/servers/tests.py b/tests/regressiontests/servers/tests.py index 5d287a195b..9537e1feb3 100644 --- a/tests/regressiontests/servers/tests.py +++ b/tests/regressiontests/servers/tests.py @@ -113,7 +113,7 @@ class LiveServerViews(LiveServerBase): Refs #2879. """ f = self.urlopen('/example_view/') - self.assertEqual(f.read(), 'example view') + self.assertEqual(f.read(), b'example view') def test_static_files(self): """ @@ -121,7 +121,7 @@ class LiveServerViews(LiveServerBase): Refs #2879. """ f = self.urlopen('/static/example_static_file.txt') - self.assertEqual(f.read(), 'example static file\n') + self.assertEqual(f.read().rstrip(b'\r\n'), b'example static file') def test_media_files(self): """ @@ -129,7 +129,7 @@ class LiveServerViews(LiveServerBase): Refs #2879. """ f = self.urlopen('/media/example_media_file.txt') - self.assertEqual(f.read(), 'example media file\n') + self.assertEqual(f.read().rstrip(b'\r\n'), b'example media file') class LiveServerDatabase(LiveServerBase): |