From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 26 Aug 2019 22:59:18 +0000 (-0700)
Subject: Fix an invalid assertEqual() call in test_descr.py (GH-15318)
X-Git-Tag: v3.7.5rc1~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31ce015db893be60ae60e963e58c902ac87f5085;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 675f9748e805..87304749974f 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -2627,12 +2627,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...