From 6a52fe165070dcbeda9b7c5b622975effcab5f40 Mon Sep 17 00:00:00 2001
From: Omer Hadari <hadari.omer@gmail.com>
Date: Sat, 4 Mar 2017 10:26:46 +0200
Subject: [PATCH] fixed internal error on unprintable raised AssertionErrors

---
 _pytest/_code/code.py     |  6 ++++--
 testing/test_assertion.py | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/_pytest/_code/code.py b/_pytest/_code/code.py
index 616d5c43138..6eceb0c7f3d 100644
--- a/_pytest/_code/code.py
+++ b/_pytest/_code/code.py
@@ -352,6 +352,8 @@ class ExceptionInfo(object):
         help for navigating the traceback.
     """
     _striptext = ''
+    _assert_start_repr = "AssertionError(u\'assert " if sys.version_info[0] < 3 else "AssertionError(\'assert "
+
     def __init__(self, tup=None, exprinfo=None):
         import _pytest._code
         if tup is None:
@@ -359,8 +361,8 @@ def __init__(self, tup=None, exprinfo=None):
             if exprinfo is None and isinstance(tup[1], AssertionError):
                 exprinfo = getattr(tup[1], 'msg', None)
                 if exprinfo is None:
-                    exprinfo = py._builtin._totext(tup[1])
-                if exprinfo and exprinfo.startswith('assert '):
+                    exprinfo = py.io.saferepr(tup[1])
+                if exprinfo and exprinfo.startswith(self._assert_start_repr):
                     self._striptext = 'AssertionError: '
         self._excinfo = tup
         #: the exception class
diff --git a/testing/test_assertion.py b/testing/test_assertion.py
index dfc9f60fb65..bc814590ad8 100644
--- a/testing/test_assertion.py
+++ b/testing/test_assertion.py
@@ -916,6 +916,25 @@ def test_unicode():
     result = testdir.runpytest()
     result.stdout.fnmatch_lines(['*AssertionError*'])
 
+def test_raise_unprintable_assertion_error(testdir):
+    testdir.makepyfile(r"""
+        def test_raise_assertion_error():
+            raise AssertionError('\xff')
+    """)
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines([r">       raise AssertionError('\xff')", 'E       AssertionError: *'])
+
+def test_raise_assertion_error_raisin_repr(testdir):
+    testdir.makepyfile(u"""
+        class RaisingRepr(object):
+            def __repr__(self):
+                raise Exception()
+        def test_raising_repr():
+            raise AssertionError(RaisingRepr())
+    """)
+    result = testdir.runpytest()
+    result.stdout.fnmatch_lines(['E       AssertionError: <unprintable AssertionError object>'])
+
 def test_issue_1944(testdir):
     testdir.makepyfile("""
         def f():