summaryrefslogtreecommitdiff
path: root/src/distutils2
diff options
context:
space:
mode:
authorKonrad Delong <konryd@gmail.com>2010-08-09 13:20:21 +0200
committerKonrad Delong <konryd@gmail.com>2010-08-09 13:20:21 +0200
commitca053a337eb10fc9523ebafd50efd5a715c53eb7 (patch)
treebb526e4710ff2293e442383f4ffe9f4de58a8fb7 /src/distutils2
parent5ab6e3a858b08bd1623cc9cf7b689ef1500cf4b0 (diff)
downloaddisutils2-ca053a337eb10fc9523ebafd50efd5a715c53eb7.tar.gz
added a version number to upload_docs
Diffstat (limited to 'src/distutils2')
-rw-r--r--src/distutils2/command/upload_docs.py3
-rw-r--r--src/distutils2/tests/test_upload_docs.py5
2 files changed, 5 insertions, 3 deletions
diff --git a/src/distutils2/command/upload_docs.py b/src/distutils2/command/upload_docs.py
index 7838d85..dbc31a0 100644
--- a/src/distutils2/command/upload_docs.py
+++ b/src/distutils2/command/upload_docs.py
@@ -94,9 +94,10 @@ class upload_docs(Command):
def run(self):
name = self.distribution.metadata['Name']
+ version = self.distribution.metadata['Version']
zip_file = zip_dir(self.upload_dir)
- fields = {':action': 'doc_upload', 'name': name}.items()
+ fields = [(':action', 'doc_upload'), ('name', name), ('version', version)]
files = [('content', name, zip_file.getvalue())]
content_type, body = encode_multipart(fields, files)
diff --git a/src/distutils2/tests/test_upload_docs.py b/src/distutils2/tests/test_upload_docs.py
index c90f6b4..e47e1aa 100644
--- a/src/distutils2/tests/test_upload_docs.py
+++ b/src/distutils2/tests/test_upload_docs.py
@@ -116,12 +116,13 @@ class UploadDocsTestCase(support.TempdirManager, support.EnvironGuard,
self.assertTrue(handler.headers.dict['content-type']
.startswith('multipart/form-data;'))
- action, name, content =\
- request_data.split("----------------GHSKFJDLGDS7543FJKLFHRE75642756743254")[1:4]
+ action, name, version, content =\
+ request_data.split("----------------GHSKFJDLGDS7543FJKLFHRE75642756743254")[1:5]
# check that we picked the right chunks
self.assertIn('name=":action"', action)
self.assertIn('name="name"', name)
+ self.assertIn('name="version"', version)
self.assertIn('name="content"', content)
# check their contents