From: Thomas Heller <theller@ctypes.org>
Date: Thu, 12 Jul 2007 19:42:59 +0000 (+0000)
Subject: Simple fixes.
X-Git-Tag: v3.0a1~656
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0d8b6eee9762eba3e3c075ddba1c5542e0e64b9;p=thirdparty%2FPython%2Fcpython.git

Simple fixes.
---

diff --git a/Lib/ctypes/test/test_repr.py b/Lib/ctypes/test/test_repr.py
index f6f936665025..383082f83187 100644
--- a/Lib/ctypes/test/test_repr.py
+++ b/Lib/ctypes/test/test_repr.py
@@ -22,7 +22,7 @@ class ReprTest(unittest.TestCase):
             self.failUnlessEqual("<X object at", repr(typ(42))[:12])
 
     def test_char(self):
-        self.failUnlessEqual("c_char('x')", repr(c_char('x')))
+        self.failUnlessEqual("c_char(s'x')", repr(c_char('x')))
         self.failUnlessEqual("<X object at", repr(X('x'))[:12])
 
 if __name__ == "__main__":
diff --git a/Lib/ctypes/test/test_structures.py b/Lib/ctypes/test/test_structures.py
index ab98a66b9036..0aa4aea43088 100644
--- a/Lib/ctypes/test/test_structures.py
+++ b/Lib/ctypes/test/test_structures.py
@@ -291,15 +291,9 @@ class StructureTestCase(unittest.TestCase):
 
         cls, msg = self.get_except(Person, "Someone", (1, 2))
         self.failUnlessEqual(cls, RuntimeError)
-        # In Python 2.5, Exception is a new-style class, and the repr changed
-        if issubclass(Exception, object):
-            self.failUnlessEqual(msg,
-                                 "(Phone) <type 'TypeError'>: "
-                                 "expected string or Unicode object, int found")
-        else:
-            self.failUnlessEqual(msg,
-                                 "(Phone) TypeError: "
-                                 "expected string or Unicode object, int found")
+        self.failUnlessEqual(msg,
+                             "(Phone) <type 'TypeError'>: "
+                             "expected string, int found")
 
         cls, msg = self.get_except(Person, "Someone", ("a", "b", "c"))
         self.failUnlessEqual(cls, RuntimeError)