commit 9db281662ded4e855cd8fbdfb8061efbbce282e3
author Benjamin Peterson <benjamin@python.org> Mon Jun 16 23:16:31 2014 -0700
committer Benjamin Peterson <benjamin@python.org> Mon Jun 16 23:16:31 2014 -0700
tree db5393c62f0bc43134dfc6af0b72e96dafc6a5ee
parent 068f81e11528b367f56bc3922554fa2dd00a7071
parent 0fd3972a3f8f9fcb9cecd30a608eea02d6b3b18e

merge 3.3

Lib/test/test_httpservers.py

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