diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2016-05-31 22:26:29 -0400 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-05-31 22:26:29 -0400 |
commit | 1f1601d16b93b12451363b46b4b0725300f9b21b (patch) | |
tree | 23300eace03186de3519415d13df528bb0500ef6 /setuptools/command/upload_docs.py | |
parent | f84edd610dbc12497a79b172312e2061979f5523 (diff) | |
download | python-setuptools-git-1f1601d16b93b12451363b46b4b0725300f9b21b.tar.gz |
Return content type in _build_multipart
Diffstat (limited to 'setuptools/command/upload_docs.py')
-rw-r--r-- | setuptools/command/upload_docs.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py index 3158c435..01b49046 100644 --- a/setuptools/command/upload_docs.py +++ b/setuptools/command/upload_docs.py @@ -133,7 +133,8 @@ class upload_docs(upload): part_groups = map(builder, data.items()) parts = itertools.chain.from_iterable(part_groups) body_items = itertools.chain(parts, end_items) - return b''.join(body_items) + content_type = 'multipart/form-data; boundary=%s' % boundary + return b''.join(body_items), content_type def upload_file(self, filename): with open(filename, 'rb') as f: @@ -151,7 +152,7 @@ class upload_docs(upload): credentials = credentials.decode('ascii') auth = "Basic " + credentials - body = self._build_multipart(data) + body, ct = self._build_multipart(data) self.announce("Submitting documentation to %s" % (self.repository), log.INFO) @@ -173,7 +174,7 @@ class upload_docs(upload): try: conn.connect() conn.putrequest("POST", url) - content_type = 'multipart/form-data; boundary=%s' % boundary + content_type = ct conn.putheader('Content-type', content_type) conn.putheader('Content-length', str(len(body))) conn.putheader('Authorization', auth) |