(original) (raw)

changeset: 101857:b0be24a2f16c parent: 101855:a5a013ca5687 parent: 101856:02824cee7624 user: Berker Peksag berker.peksag@gmail.com date: Fri Jun 10 23:02:04 2016 +0300 files: Lib/distutils/command/register.py Misc/NEWS description: Issue #20900: Merge from 3.5 diff -r a5a013ca5687 -r b0be24a2f16c Lib/distutils/command/register.py --- a/Lib/distutils/command/register.py Fri Jun 10 12:20:49 2016 -0700 +++ b/Lib/distutils/command/register.py Fri Jun 10 23:02:04 2016 +0300 @@ -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 a5a013ca5687 -r b0be24a2f16c Lib/distutils/tests/test_register.py --- a/Lib/distutils/tests/test_register.py Fri Jun 10 12:20:49 2016 -0700 +++ b/Lib/distutils/tests/test_register.py Fri Jun 10 23:02:04 2016 +0300 @@ -301,6 +301,20 @@ results = self.get_logs(INFO) self.assertEqual(results, ['running check', 'xxx']) + def test_show_response(self): + # test that 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 + try: + cmd.run() + finally: + del register_module.input + + results = self.get_logs(INFO) + self.assertEqual(results[3], 75 * '-' + '\nxxx\n' + 75 * '-') + def test_suite(): return unittest.makeSuite(RegisterTestCase) diff -r a5a013ca5687 -r b0be24a2f16c Lib/distutils/tests/test_upload.py --- a/Lib/distutils/tests/test_upload.py Fri Jun 10 12:20:49 2016 -0700 +++ b/Lib/distutils/tests/test_upload.py Fri Jun 10 23:02:04 2016 +0300 @@ -140,7 +140,7 @@ # The PyPI response body was echoed results = self.get_logs(INFO) - self.assertIn('xyzzy\n', results[-1]) + self.assertEqual(results[-1], 75 * '-' + '\nxyzzy\n' + 75 * '-') def test_upload_fails(self): self.next_msg = "Not Found" diff -r a5a013ca5687 -r b0be24a2f16c Misc/NEWS --- a/Misc/NEWS Fri Jun 10 12:20:49 2016 -0700 +++ b/Misc/NEWS Fri Jun 10 23:02:04 2016 +0300 @@ -38,6 +38,9 @@ Library ------- +- Issue #20900: distutils register command now decodes HTTP responses + correctly. Initial patch by ingrid. + - Issue #27186: Add os.PathLike support to pathlib, removing its provisional status (part of PEP 519). /berker.peksag@gmail.com