commit 0fd3972a3f8f9fcb9cecd30a608eea02d6b3b18e
author Benjamin Peterson <benjamin@python.org> Mon Jun 16 23:16:06 2014 -0700
committer Benjamin Peterson <benjamin@python.org> Mon Jun 16 23:16:06 2014 -0700
tree 094aaecc2973a52b5bc30aeef9dc0fe785bf159c
parent 6cd1954c5cff4b3722a183d13648c71b18259778
parent 314dc126ce45a5e1369b408645e5da480a05bc9d

merge 3.2

Lib/test/test_httpservers.py

diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
index 47c6796..07b9cd7 100644
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -466,7 +466,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))