Index: Lib/test/test_gdb.py
===================================================================
--- Lib/test/test_gdb.py	(revision 79894)
+++ Lib/test/test_gdb.py	(working copy)
@@ -226,7 +226,9 @@
             # This will only work on wide-unicode builds:
             self.assertGdbRepr(unichr(0x1D121))
         except ValueError, e:
-            if e.message != 'unichr() arg not in range(0x10000) (narrow Python build)':
+            # We're probably on a narrow-unicode build; if we're seeing a
+            # different problem, then re-raise it:
+            if e.args != ('unichr() arg not in range(0x10000) (narrow Python build)',):
                 raise e
 
     def test_sets(self):