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

Sat Oct 18 23:11:05 CEST 2014

https://hg.python.org/cpython/rev/4e1e68069480
changeset: 93130:4e1e68069480
parent: 93127:cb8606fc84df
parent: 93129:5c0f17063fb8
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Sat Oct 18 17:10:32 2014 -0400
summary:
 Merge with 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
@@ -333,7 +333,7 @@
 response = self.request('/', method='FOO')
 self.check_status_and_reason(response, 501)
 # requests must be case sensitive,so this should fail too
- response = self.request('/', method='get')
+ response = self.request('/', method='custom')
 self.check_status_and_reason(response, 501)
 response = self.request('/', method='GETs')
 self.check_status_and_reason(response, 501)
-- 
Repository URL: https://hg.python.org/cpython
