diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2017-11-15 15:53:28 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-15 15:53:28 (GMT) |
| commit | f8a4c03ede6048022f60a58d5a21b278b78a8a16 (patch) | |
| tree | d9f7f1d0e827315be914b2408359067a12bcbaa2 /Lib | |
| parent | aca7f574b06c72c85a5e3e4b16a8a5e384a7c4a8 (diff) | |
| download | cpython-f8a4c03ede6048022f60a58d5a21b278b78a8a16.zip cpython-f8a4c03ede6048022f60a58d5a21b278b78a8a16.tar.gz cpython-f8a4c03ede6048022f60a58d5a21b278b78a8a16.tar.bz2 | |
bpo-30399: Get rid of trailing comma in the repr of BaseException. (#1650)
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_baseexception.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_httplib.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_yield_from.py | 18 |
3 files changed, 11 insertions, 11 deletions
diff --git a/Lib/test/test_baseexception.py b/Lib/test/test_baseexception.py index 27d514f..c055ee3 100644 --- a/Lib/test/test_baseexception.py +++ b/Lib/test/test_baseexception.py @@ -92,7 +92,7 @@ class ExceptionClassTests(unittest.TestCase): exc = Exception(arg) results = ([len(exc.args), 1], [exc.args[0], arg], [str(exc), str(arg)], - [repr(exc), exc.__class__.__name__ + repr(exc.args)]) + [repr(exc), '%s(%r)' % (exc.__class__.__name__, arg)]) self.interface_test_driver(results) def test_interface_multi_arg(self): diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py index 0d79cae..a3f8194 100644 --- a/Lib/test/test_httplib.py +++ b/Lib/test/test_httplib.py @@ -497,7 +497,7 @@ class BasicTest(TestCase): def test_bad_status_repr(self): exc = client.BadStatusLine('') - self.assertEqual(repr(exc), '''BadStatusLine("\'\'",)''') + self.assertEqual(repr(exc), '''BadStatusLine("''")''') def test_partial_reads(self): # if we have Content-Length, HTTPResponse knows when to close itself, diff --git a/Lib/test/test_yield_from.py b/Lib/test/test_yield_from.py index d1da838..ce21c3d 100644 --- a/Lib/test/test_yield_from.py +++ b/Lib/test/test_yield_from.py @@ -418,7 +418,7 @@ class TestPEP380Operation(unittest.TestCase): "Yielded g2 spam", "Yielded g2 more spam", "Finishing g2", - "g2 returned StopIteration(3,)", + "g2 returned StopIteration(3)", "Yielded g1 eggs", "Finishing g1", ]) @@ -696,15 +696,15 @@ class TestPEP380Operation(unittest.TestCase): "g starting", "f resuming g", "g returning 1", - "f caught StopIteration(1,)", + "f caught StopIteration(1)", "g starting", "f resuming g", "g returning (2,)", - "f caught StopIteration((2,),)", + "f caught StopIteration((2,))", "g starting", "f resuming g", - "g returning StopIteration(3,)", - "f caught StopIteration(StopIteration(3,),)", + "g returning StopIteration(3)", + "f caught StopIteration(StopIteration(3))", ]) def test_send_and_return_with_value(self): @@ -741,17 +741,17 @@ class TestPEP380Operation(unittest.TestCase): "f sending spam to g", "g received 'spam'", "g returning 1", - 'f caught StopIteration(1,)', + 'f caught StopIteration(1)', 'g starting', 'f sending spam to g', "g received 'spam'", 'g returning (2,)', - 'f caught StopIteration((2,),)', + 'f caught StopIteration((2,))', 'g starting', 'f sending spam to g', "g received 'spam'", - 'g returning StopIteration(3,)', - 'f caught StopIteration(StopIteration(3,),)' + 'g returning StopIteration(3)', + 'f caught StopIteration(StopIteration(3))' ]) def test_catching_exception_from_subgen_and_returning(self): |