fixes #65

2 files changed, 17 insertions, 1 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 280d959..1879326 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,7 @@ Version 3.1.2 released XXXX-XX-XX
 * Updated documentation to reflect separators behavior when indent is
   not None
   https://github.com/simplejson/simplejson/issues/59
+* Test suite should be compatible with debug builds of Python 2.x and 3.x
 
 Version 3.1.1 released 2013-02-21
 
diff --git a/simplejson/tests/test_tool.py b/simplejson/tests/test_tool.py
index af3c4ba..ac2a14c 100644
--- a/simplejson/tests/test_tool.py
+++ b/simplejson/tests/test_tool.py
@@ -5,6 +5,21 @@ import textwrap
 import unittest
 import subprocess
 import tempfile
+try:
+    # Python 3.x
+    from test.support import strip_python_stderr
+except ImportError:
+    # Python 2.6+
+    try:
+        from test.test_support import strip_python_stderr
+    except ImportError:
+        # Python 2.5
+        import re
+        def strip_python_stderr(stderr):
+            return re.sub(
+                r"\[\d+ refs\]\r?\n?$".encode(),
+                "".encode(),
+                stderr).strip()
 
 class TestTool(unittest.TestCase):
     data = """
@@ -46,7 +61,7 @@ class TestTool(unittest.TestCase):
                                 stderr=subprocess.PIPE,
                                 stdout=subprocess.PIPE)
         out, err = proc.communicate(data)
-        self.assertEqual(err, ''.encode())
+        self.assertEqual(strip_python_stderr(err), ''.encode())
         self.assertEqual(proc.returncode, 0)
         return out