Fix failing tests for escaped magics and undo changes to text.py.

The changes to text.py were unnecessary, but since this branch has
already been published and merged I'm simply undoing them rather than
rebasing it and dropping that commit.

IPython/core/inputsplitter.py

@@ -727,7 +727,7 b' class EscapedTransformer(object):'
         "Translate lines escaped with: %"
         tpl = '%sget_ipython().magic(%s)'
         cmd = make_quoted_expr(' '.join([line_info.fpart,
-                                         line_info.rest])).strip()
+                                         line_info.rest]).strip())
         return tpl % (line_info.lspace, cmd)
 
     @staticmethod

IPython/utils/text.py

@@ -295,9 +295,8 b' def make_quoted_expr(s):'
         quote = "'''"
     else:
         # give up, backslash-escaped string will do
-        return '"%s"' % esc_quotes(s).strip()
-    txt = (s + tailpadding).strip()
-    res = raw + quote + txt + quote + tail
+        return '"%s"' % esc_quotes(s)
+    res = raw + quote + s + tailpadding + quote + tail
     return res