merge 3.4

This commit is contained in:
Benjamin Peterson 2014-06-16 23:16:37 -07:00
commit 2ce54c2912

View file

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