[Python-checkins] cpython (3.3): Fix TypeError on "setup.py upload --show-response".
antoine.pitrou
python-checkins at python.org
Sun Dec 22 18:15:03 CET 2013
http://hg.python.org/cpython/rev/bb42e10a5620
changeset: 88129:bb42e10a5620
branch: 3.3
parent: 88127:b63258b6eb4d
user: Antoine Pitrou <solipsis at pitrou.net>
date: Sun Dec 22 18:13:51 2013 +0100
summary:
Fix TypeError on "setup.py upload --show-response".
files:
Lib/distutils/command/register.py | 5 +----
Lib/distutils/command/upload.py | 3 ++-
Lib/distutils/config.py | 7 +++++++
Lib/distutils/tests/test_upload.py | 17 ++++++++++++++++-
Misc/NEWS | 2 ++
5 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/Lib/distutils/command/register.py b/Lib/distutils/command/register.py
--- a/Lib/distutils/command/register.py
+++ b/Lib/distutils/command/register.py
@@ -5,7 +5,6 @@
# created 2002/10/21, Richard Jones
-import cgi
import os, string, getpass
import io
import urllib.parse, urllib.request
@@ -88,9 +87,7 @@
'''
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.
diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -196,5 +196,6 @@
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)
diff --git a/Lib/distutils/config.py b/Lib/distutils/config.py
--- a/Lib/distutils/config.py
+++ b/Lib/distutils/config.py
@@ -3,6 +3,7 @@
Provides the PyPIRCCommand class, the base class for the command classes
that uses .pypirc in the distutils.command package.
"""
+import cgi
import os
from configparser import ConfigParser
@@ -101,6 +102,12 @@
return {}
+ def _read_pypi_response(self, response):
+ """Read and decode a PyPI HTTP response."""
+ content_type = response.getheader('content-type', 'text/plain')
+ encoding = cgi.parse_header(content_type)[1].get('charset', 'ascii')
+ return response.read().decode(encoding)
+
def initialize_options(self):
"""Initialize options."""
self.repository = None
diff --git a/Lib/distutils/tests/test_upload.py b/Lib/distutils/tests/test_upload.py
--- a/Lib/distutils/tests/test_upload.py
+++ b/Lib/distutils/tests/test_upload.py
@@ -6,6 +6,7 @@
from distutils.command import upload as upload_mod
from distutils.command.upload import upload
from distutils.core import Distribution
+from distutils.log import INFO
from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
@@ -48,6 +49,14 @@
self.req = None
self.msg = 'OK'
+ def getheader(self, name, default=None):
+ return {
+ 'content-type': 'text/plain; charset=utf-8',
+ }.get(name.lower(), default)
+
+ def read(self):
+ return b'xyzzy'
+
def getcode(self):
return 200
@@ -108,10 +117,11 @@
# lets run it
pkg_dir, dist = self.create_dist(dist_files=dist_files)
cmd = upload(dist)
+ cmd.show_response = 1
cmd.ensure_finalized()
cmd.run()
- # what did we send ?
+ # what did we send ?
headers = dict(self.last_open.req.headers)
self.assertEqual(headers['Content-length'], '2087')
self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
@@ -120,6 +130,11 @@
'https://pypi.python.org/pypi')
self.assertIn(b'xxx', self.last_open.req.data)
+ # The PyPI response body was echoed
+ results = self.get_logs(INFO)
+ self.assertIn('xyzzy\n', results[-1])
+
+
def test_suite():
return unittest.makeSuite(uploadTestCase)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,8 @@
Library
-------
+- Fix TypeError on "setup.py upload --show-response".
+
- Issue #12226: HTTPS is now used by default when connecting to PyPI.
- Issue #20045: Fix "setup.py register --list-classifiers".
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list