summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2015-09-10 18:23:41 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2015-09-10 18:24:03 +0200
commit0cc0e676c0060739a9bbbd3e42287de008f11f53 (patch)
tree7fcd66b3a2ab4b2e0cb99133343e917daa78299a
parent613ee39bf8535fe926183aad4024a4e34ea71dcb (diff)
And fixed merge accident :-(
-rw-r--r--django/test/runner.py6
1 files 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("""