summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-06-17 06:16:31 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-06-17 06:16:31 (GMT)
commit9db281662ded4e855cd8fbdfb8061efbbce282e3 (patch)
treedb5393c62f0bc43134dfc6af0b72e96dafc6a5ee
parent068f81e11528b367f56bc3922554fa2dd00a7071 (diff)
parent0fd3972a3f8f9fcb9cecd30a608eea02d6b3b18e (diff)
downloadcpython-9db281662ded4e855cd8fbdfb8061efbbce282e3.zip
cpython-9db281662ded4e855cd8fbdfb8061efbbce282e3.tar.gz
cpython-9db281662ded4e855cd8fbdfb8061efbbce282e3.tar.bz2
merge 3.3
-rw-r--r--Lib/test/test_httpservers.py2
1 files changed, 1 insertions, 1 deletions
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 @@ 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))