From: Dan Mick <dan.mick@redhat.com>
Date: Tue, 11 Apr 2017 23:27:33 +0000 (-0700)
Subject: mgr/PyModules handle_pyerror: don't add extra newlines to tb
X-Git-Tag: v12.0.3~290^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6fc3a46295c8b5330e3611deb5edf97135e3dd24;p=ceph.git

mgr/PyModules handle_pyerror: don't add extra newlines to tb

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/src/mgr/PyModules.cc b/src/mgr/PyModules.cc
index e77df011a8c8..247e6b3fcd32 100644
--- a/src/mgr/PyModules.cc
+++ b/src/mgr/PyModules.cc
@@ -306,7 +306,7 @@ std::string handle_pyerror()
         object format_exception(traceback.attr("format_exception"));
         formatted_list = format_exception(hexc,hval,htb);
     }
-    formatted = str("\n").join(formatted_list);
+    formatted = str("").join(formatted_list);
     return extract<std::string>(formatted);
 }