merge 3.2

benjaminp · benjaminp · commit 0fd3972a3f8f · 2014-06-16T23:16:06.000-07:00
diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
@@ -466,7 +466,7 @@ def test_os_environ_is_not_altered(self):
 
     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))
 
 
