mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix TypeError on "setup.py upload --show-response".

Browse source
This commit is contained in:
Antoine Pitrou 2013-12-22 18:14:56 +01:00
commit 20d5adea6a
5 changed files with 28 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/distutils/command/register.py
View file

@ -5,7 +5,6 @@ Implements the Distutils 'register' command (register with the repository).
# created 2002/10/21, Richard Jones
import cgi
import os, string, getpass
import io
import urllib.parse, urllib.request
@ -88,9 +87,7 @@ class register(PyPIRCCommand):
'''
url = self.repository+'?:action=list_classifiers'
response = urllib.request.urlopen(url)
content_type = response.getheader('content-type', 'text/plain')
encoding = cgi.parse_header(content_type)[1].get('charset', 'ascii')
log.info(response.read().decode(encoding))
log.info(self._read_pypi_response(response))
def verify_metadata(self):
''' Send the metadata to the package index server to be checked.

3
Lib/distutils/command/upload.py
View file

@ -196,5 +196,6 @@ class upload(PyPIRCCommand):
self.announce('Upload failed (%s): %s' % (status, reason),
log.ERROR)
if self.show_response:
msg = '\n'.join(('-' * 75, result.read(), '-' * 75))
text = self._read_pypi_response(result)
msg = '\n'.join(('-' * 75, text, '-' * 75))
self.announce(msg, log.INFO)