[Python-checkins] cpython (3.3): Issue #20045: Fix "setup.py register --list-classifiers".
antoine.pitrou
python-checkins at python.org
Sat Dec 21 22:59:14 CET 2013
http://hg.python.org/cpython/rev/cffed58b1bbd
changeset: 88118:cffed58b1bbd
branch: 3.3
parent: 88115:282043a0ab22
user: Antoine Pitrou <solipsis at pitrou.net>
date: Sat Dec 21 22:57:56 2013 +0100
summary:
Issue #20045: Fix "setup.py register --list-classifiers".
files:
Lib/distutils/command/register.py | 5 +++-
Lib/distutils/tests/support.py | 7 +++--
Lib/distutils/tests/test_register.py | 19 ++++++++++++++-
Misc/NEWS | 2 +
4 files changed, 27 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,6 +5,7 @@
# created 2002/10/21, Richard Jones
+import cgi
import os, string, getpass
import io
import urllib.parse, urllib.request
@@ -87,7 +88,9 @@
'''
url = self.repository+'?:action=list_classifiers'
response = urllib.request.urlopen(url)
- log.info(response.read())
+ content_type = response.getheader('content-type', 'text/plain')
+ encoding = cgi.parse_header(content_type)[1].get('charset', 'ascii')
+ log.info(response.read().decode(encoding))
def verify_metadata(self):
''' Send the metadata to the package index server to be checked.
diff --git a/Lib/distutils/tests/support.py b/Lib/distutils/tests/support.py
--- a/Lib/distutils/tests/support.py
+++ b/Lib/distutils/tests/support.py
@@ -32,14 +32,15 @@
def _log(self, level, msg, args):
if level not in (DEBUG, INFO, WARN, ERROR, FATAL):
raise ValueError('%s wrong log level' % str(level))
+ if not isinstance(msg, str):
+ raise TypeError("msg should be str, not '%.200s'"
+ % (type(msg).__name__))
self.logs.append((level, msg, args))
def get_logs(self, *levels):
def _format(msg, args):
- if len(args) == 0:
- return msg
return msg % args
- return [_format(msg, args) for level, msg, args
+ return [msg % args for level, msg, args
in self.logs if level in levels]
def clear_logs(self):
diff --git a/Lib/distutils/tests/test_register.py b/Lib/distutils/tests/test_register.py
--- a/Lib/distutils/tests/test_register.py
+++ b/Lib/distutils/tests/test_register.py
@@ -10,6 +10,7 @@
from distutils.command import register as register_module
from distutils.command.register import register
from distutils.errors import DistutilsSetupError
+from distutils.log import INFO
from distutils.tests.test_config import PyPIRCCommandTestCase
@@ -58,12 +59,18 @@
def __call__(self, *args):
return self
- def open(self, req):
+ def open(self, req, data=None, timeout=None):
self.reqs.append(req)
return self
def read(self):
- return 'xxx'
+ return b'xxx'
+
+ def getheader(self, name, default=None):
+ return {
+ 'content-type': 'text/plain; charset=utf-8',
+ }.get(name.lower(), default)
+
class RegisterTestCase(PyPIRCCommandTestCase):
@@ -285,6 +292,14 @@
cmd.check_metadata()
self.assertEqual(len(w.warnings), 1)
+ def test_list_classifiers(self):
+ cmd = self._get_cmd()
+ cmd.list_classifiers = 1
+ cmd.run()
+ results = self.get_logs(INFO)
+ self.assertEqual(results, ['running check', 'xxx'])
+
+
def test_suite():
return unittest.makeSuite(RegisterTestCase)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,8 @@
Library
-------
+- Issue #20045: Fix "setup.py register --list-classifiers".
+
- Issue #18879: When a method is looked up on a temporary file, avoid closing
the file before the method is possibly called.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list