summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-06-18 21:43:16 +0300
committerBerker Peksag <berker.peksag@gmail.com>2016-06-18 21:43:16 +0300
commitcb19a1823810d0b3589c00b2fdd7e8f23082cc3f (patch)
tree8d718322da8780c8cdf1df5e75ca05c15948202a
parent8c031e1739a843cd79631e4f7e2d746ed45423ac (diff)
parent574bde6ee98b09b974ac5e0adbe46eeebc5173b6 (diff)
downloadpython-setuptools-git-cb19a1823810d0b3589c00b2fdd7e8f23082cc3f.tar.gz
Issue #27349: Merge from 3.5
-rw-r--r--command/upload.py2
-rw-r--r--tests/test_upload.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/command/upload.py b/command/upload.py
index 0afcbf23..1fd574a9 100644
--- a/command/upload.py
+++ b/command/upload.py
@@ -91,7 +91,7 @@ class upload(PyPIRCCommand):
data = {
# action
':action': 'file_upload',
- 'protcol_version': '1',
+ 'protocol_version': '1',
# identify release
'name': meta.get_name(),
diff --git a/tests/test_upload.py b/tests/test_upload.py
index 964aac7e..3eecf8af 100644
--- a/tests/test_upload.py
+++ b/tests/test_upload.py
@@ -130,13 +130,14 @@ class uploadTestCase(PyPIRCCommandTestCase):
# 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)