[Python-checkins] cpython (merge 3.5 -> default): Issue #27349: Merge from 3.5

Sat Jun 18 14:42:32 EDT 2016

https://hg.python.org/cpython/rev/a4d00ae53e35
changeset: 102094:a4d00ae53e35
parent: 102092:0b1cd695e7aa
parent: 102093:81a9ce02b49b
user: Berker Peksag <berker.peksag at gmail.com>
date: Sat Jun 18 21:43:16 2016 +0300
summary:
 Issue #27349: Merge from 3.5
files:
 Lib/distutils/command/upload.py | 2 +-
 Lib/distutils/tests/test_upload.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -91,7 +91,7 @@
 data = {
 # action
 ':action': 'file_upload',
- 'protcol_version': '1',
+ 'protocol_version': '1',
 
 # identify release
 'name': meta.get_name(),
diff --git a/Lib/distutils/tests/test_upload.py b/Lib/distutils/tests/test_upload.py
--- a/Lib/distutils/tests/test_upload.py
+++ b/Lib/distutils/tests/test_upload.py
@@ -130,13 +130,14 @@
 
 # what did we send ?
 headers = dict(self.last_open.req.headers)
- self.assertEqual(headers['Content-length'], '2161')
+ self.assertEqual(headers['Content-length'], '2162')
 content_type = headers['Content-type']
 self.assertTrue(content_type.startswith('multipart/form-data'))
 self.assertEqual(self.last_open.req.get_method(), 'POST')
 expected_url = 'https://pypi.python.org/pypi'
 self.assertEqual(self.last_open.req.get_full_url(), expected_url)
 self.assertTrue(b'xxx' in self.last_open.req.data)
+ self.assertIn(b'protocol_version', self.last_open.req.data)
 
 # The PyPI response body was echoed
 results = self.get_logs(INFO)
-- 
Repository URL: https://hg.python.org/cpython
