From: Martin Panter <vadmium+py@gmail.com>
Date: Sat, 14 May 2016 06:17:43 +0000 (+0000)
Subject: Remove old Python 2 compatibility from ctypes test
X-Git-Tag: v3.6.0a1~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=38e2f175ea7a352bc452f4e3ea6f5bcabd3dc5cf;p=thirdparty%2FPython%2Fcpython.git

Remove old Python 2 compatibility from ctypes test
---

diff --git a/Lib/ctypes/test/test_structures.py b/Lib/ctypes/test/test_structures.py
index 84d456c3cc38..e00bb046b444 100644
--- a/Lib/ctypes/test/test_structures.py
+++ b/Lib/ctypes/test/test_structures.py
@@ -326,11 +326,8 @@ class StructureTestCase(unittest.TestCase):
 
         cls, msg = self.get_except(Person, b"Someone", (b"a", b"b", b"c"))
         self.assertEqual(cls, RuntimeError)
-        if issubclass(Exception, object):
-            self.assertEqual(msg,
-                                 "(Phone) <class 'TypeError'>: too many initializers")
-        else:
-            self.assertEqual(msg, "(Phone) TypeError: too many initializers")
+        self.assertEqual(msg,
+                             "(Phone) <class 'TypeError'>: too many initializers")
 
     def test_huge_field_name(self):
         # issue12881: segfault with large structure field names