diff options
| author | Florian Schulze <florian.schulze@gmx.net> | 2017-03-11 14:45:15 +0100 |
|---|---|---|
| committer | Florian Schulze <florian.schulze@gmx.net> | 2017-03-11 14:53:03 +0100 |
| commit | 62fc6681509f04ba7ee12e87d6ac5d6056214fa8 (patch) | |
| tree | b5e0f991210b66e39b8afa33ba0d56f65a663dcd /setuptools | |
| parent | c4ff7cc6551097d513d310fac6d0c099b1afa32e (diff) | |
| download | external_python_setuptools-62fc6681509f04ba7ee12e87d6ac5d6056214fa8.tar.gz external_python_setuptools-62fc6681509f04ba7ee12e87d6ac5d6056214fa8.tar.bz2 external_python_setuptools-62fc6681509f04ba7ee12e87d6ac5d6056214fa8.zip | |
Fix documentation upload by fixing content_type in _build_multipart on Python 3.x.
Diffstat (limited to 'setuptools')
| -rw-r--r-- | setuptools/command/upload_docs.py | 2 | ||||
| -rw-r--r-- | setuptools/tests/test_upload_docs.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/setuptools/command/upload_docs.py b/setuptools/command/upload_docs.py index eeb0718b..910d5ea7 100644 --- a/setuptools/command/upload_docs.py +++ b/setuptools/command/upload_docs.py @@ -138,7 +138,7 @@ class upload_docs(upload): part_groups = map(builder, data.items()) parts = itertools.chain.from_iterable(part_groups) body_items = itertools.chain(parts, end_items) - content_type = 'multipart/form-data; boundary=%s' % boundary + content_type = 'multipart/form-data; boundary=%s' % boundary.decode('ascii') return b''.join(body_items), content_type def upload_file(self, filename): diff --git a/setuptools/tests/test_upload_docs.py b/setuptools/tests/test_upload_docs.py index 5d50bb0b..a26e32a6 100644 --- a/setuptools/tests/test_upload_docs.py +++ b/setuptools/tests/test_upload_docs.py @@ -64,6 +64,8 @@ class TestUploadDocsTest: ) body, content_type = upload_docs._build_multipart(data) assert 'form-data' in content_type + assert "b'" not in content_type + assert 'b"' not in content_type assert isinstance(body, bytes) assert b'foo' in body assert b'content' in body |