From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 26 Aug 2019 23:02:21 +0000 (-0700)
Subject: Fix an invalid assertEqual() call in test_descr.py (GH-15318)
X-Git-Tag: v3.8.0b4~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c75f0e5bdee3cfaba9fd5b3a8549dec0aba01ebe;p=thirdparty%2FPython%2Fcpython.git

Fix an invalid assertEqual() call in test_descr.py (GH-15318)

(cherry picked from commit 6b2e3256b6752055498f41f343fb22100845bc9d)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
---

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 9998a3cc77a2..0d0c1dd1acbe 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -2659,12 +2659,8 @@ order (MRO) for bases """
         self.assertEqual(Sub.test(), Base.aProp)
 
         # Verify that super() doesn't allow keyword args
-        try:
+        with self.assertRaises(TypeError):
             super(Base, kw=1)
-        except TypeError:
-            pass
-        else:
-            self.assertEqual("super shouldn't accept keyword args")
 
     def test_basic_inheritance(self):
         # Testing inheritance from basic types...