diff options
author | Benjamin Peterson <benjamin@python.org> | 2014-06-17 06:16:37 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2014-06-17 06:16:37 (GMT) |
commit | 2ce54c2912ba4c1cb7278f319d455a01db70db4f (patch) | |
tree | 4838cf1c115091454d55f973809c3021a51b431e | |
parent | 7258e6da3bc7e7c6bc47b6cf6f40f32849006db7 (diff) | |
parent | 9db281662ded4e855cd8fbdfb8061efbbce282e3 (diff) | |
download | cpython-2ce54c2912ba4c1cb7278f319d455a01db70db4f.zip cpython-2ce54c2912ba4c1cb7278f319d455a01db70db4f.tar.gz cpython-2ce54c2912ba4c1cb7278f319d455a01db70db4f.tar.bz2 |
merge 3.4
-rw-r--r-- | Lib/test/test_httpservers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py index f30ad67..493fade 100644 --- a/Lib/test/test_httpservers.py +++ b/Lib/test/test_httpservers.py @@ -487,7 +487,7 @@ class CGIHTTPServerTestCase(BaseTestCase): def test_urlquote_decoding_in_cgi_check(self): res = self.request('/cgi-bin%2ffile1.py') - self.assertEqual((b'Hello World\n', 'text/html', 200), + self.assertEqual((b'Hello World' + self.linesep, 'text/html', 200), (res.read(), res.getheader('Content-type'), res.status)) |