merge 3.2

0fd3972a · Benjamin Peterson · 6cd1954c · 314dc126 · 0fd3972a
Commit 0fd3972a authored Jun 16, 2014 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Lib/test/test_httpservers.py Lib/test/test_httpservers.py +1 -1

No files found.
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -466,7 +466,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))