[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

Tue Jun 17 08:16:55 CEST 2014

http://hg.python.org/cpython/rev/6fc543e32a5b
changeset: 91239:6fc543e32a5b
parent: 91235:2ed64ea19d81
parent: 91238:fceb3a907260
user: Benjamin Peterson <benjamin at python.org>
date: Mon Jun 16 23:16:37 2014 -0700
summary:
 merge 3.4
files:
 Lib/test/test_httpservers.py | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
--- 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))
 
 
-- 
Repository URL: http://hg.python.org/cpython
