From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 11 Apr 2010 22:47:34 +0000 (+0000)
Subject: Blocked revisions 79979 via svnmerge
X-Git-Tag: v3.2a1~1173
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a45e9df94d2c77b37b3656e6109b6fd39e400fa;p=python

Blocked revisions 79979 via svnmerge

........
  r79979 | antoine.pitrou | 2010-04-12 00:45:47 +0200 (lun., 12 avril 2010) | 3 lines

  Fix misplaced items and incorrect title.
........
---

diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py
index 57e8aa00f4..77cf94f910 100644
--- a/Lib/test/test_gdb.py
+++ b/Lib/test/test_gdb.py
@@ -21,7 +21,7 @@ except OSError:
 gdb_version_number = re.search(b"^GNU gdb [^\d]*(\d+)\.", gdb_version)
 if int(gdb_version_number.group(1)) < 7:
     raise unittest.SkipTest("gdb versions before 7.0 didn't support python embedding"
-                            " Saw:\n" + gdb_version)
+                            " Saw:\n" + gdb_version.decode('ascii', 'replace'))
 
 # Verify that "gdb" was built with the embedded python support enabled:
 cmd = "--eval-command=python import sys; print sys.version_info"