diff -r 44e815a33ae3 Lib/distutils/command/register.py --- a/Lib/distutils/command/register.py Wed Mar 12 19:51:50 2014 -0400 +++ b/Lib/distutils/command/register.py Sat Mar 15 15:18:26 2014 -0400 @@ -296,9 +296,9 @@ result = 500, str(e) else: if self.show_response: - data = result.read() + data = self._read_pypi_response(result) result = 200, 'OK' if self.show_response: - dashes = '-' * 75 - self.announce('%s%r%s' % (dashes, data, dashes)) + msg = '\n'.join(('-' * 75, data, '-' * 75)) + self.announce(msg, log.INFO) return result diff -r 44e815a33ae3 Lib/distutils/tests/test_register.py --- a/Lib/distutils/tests/test_register.py Wed Mar 12 19:51:50 2014 -0400 +++ b/Lib/distutils/tests/test_register.py Sat Mar 15 15:18:26 2014 -0400 @@ -301,6 +301,20 @@ results = self.get_logs(INFO) self.assertEqual(results, ['running check', 'xxx']) + def test_show_reponse(self): + # Tests the show response option return a well formatted response. + cmd = self._get_cmd() + inputs = Inputs('1', 'tarek', 'y') + register_module.input = inputs.__call__ + cmd.show_response = 1 + cmd.run() + + results = self.get_logs(INFO) + results = ''.join(results) + # The response string we are looking for. + expected = (75 * '-') + '\nxxx\n' + (75 * '-') + self.assertIn(expected, results) + def test_suite(): return unittest.makeSuite(RegisterTestCase) diff -r 44e815a33ae3 Lib/distutils/tests/test_upload.py --- a/Lib/distutils/tests/test_upload.py Wed Mar 12 19:51:50 2014 -0400 +++ b/Lib/distutils/tests/test_upload.py Sat Mar 15 15:18:26 2014 -0400 @@ -135,6 +135,27 @@ results = self.get_logs(INFO) self.assertIn('xyzzy\n', results[-1]) + def test_show_reponse(self): + # Tests the show response option return a well formatted response. + tmp = self.mkdtemp() + path = os.path.join(tmp, 'xxx') + self.write_file(path) + command, pyversion, filename = 'xxx', '2.6', path + dist_files = [(command, pyversion, filename)] + self.write_file(self.rc, PYPIRC_LONG_PASSWORD) + + pkg_dir, dist = self.create_dist(dist_files=dist_files) + cmd = upload(dist) + cmd.show_response = 1 + cmd.ensure_finalized() + cmd.run() + + results = self.get_logs(INFO) + results = ''.join(results) + # The response string we are looking for. + expected = (75 * '-') + '\nxyzzy\n' + (75 * '-') + self.assertIn(expected, results) + def test_suite(): return unittest.makeSuite(uploadTestCase)