From 0cc0e676c0060739a9bbbd3e42287de008f11f53 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Thu, 10 Sep 2015 18:23:41 +0200
Subject: [PATCH] And fixed merge accident :-(

---
 django/test/runner.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/django/test/runner.py b/django/test/runner.py
index 06e0d031e9..1baad7c622 100644
--- a/django/test/runner.py
+++ b/django/test/runner.py
@@ -95,11 +95,9 @@ class RemoteTestResult(object):
             pickle.dumps(err)
         except Exception as exc:
             original_exc_txt = repr(err[1])
-            original_exc_txt = textwrap.fill(original_exc_txt, 75)
-            original_exc_txt = textwrap.indent(original_exc_txt, '    ')
+            original_exc_txt = textwrap.fill(original_exc_txt, 75, initial_indent='    ', subsequent_indent='    ')
             pickle_exc_txt = repr(exc)
-            pickle_exc_txt = textwrap.fill(pickle_exc_txt, 75)
-            pickle_exc_txt = textwrap.indent(pickle_exc_txt, '    ')
+            pickle_exc_txt = textwrap.fill(pickle_exc_txt, 75, initial_indent='    ', subsequent_indent='    ')
             if tblib is None:
                 print("""