Preserve readable cmd_line quoting while escaping newlines and add test (Closes #210)

Author: fabianp

mprof.py

@@ -1,7 +1,6 @@
 import glob
 import os
 import os.path as osp
-import shlex
 import sys
 import re
 import copy
@@ -176,7 +175,10 @@ def clean_action():
 
 def get_cmd_line(args):
     """Given a set or arguments, compute command-line."""
-    args = [shlex.quote(s).replace('\n', '\\n') for s in args]
+    # Escape newlines so the CMDLINE record in the .dat file remains on a
+    # single line and does not break read_mprofile_file() (#210).
+    blanks = set(' \t\n')
+    args = [s.replace('\n', '\\n') if blanks.isdisjoint(s) else "'" + s.replace('\n', '\\n') + "'" for s in args]
     return ' '.join(args)
 
 def find_first_process(name):

test/test_mprof.py

@@ -101,6 +101,26 @@ class Options:
             finally:
                 pl.close(fig)
 
+    def test_multiline_cmdline_arg_roundtrip(self):
+        # Verify that multiline CLI arguments passed to `mprof run` do not
+        # write raw newlines into the CMDLINE header of the .dat file, which
+        # previously caused read_mprofile_file() to crash with ValueError
+        # on blank or single-token continuation lines (Issue #210 / PR #363).
+        multiline_arg = "hello\n\nworld"
+        cmd_line = mprof.get_cmd_line(["python", "script.py", multiline_arg])
+        self.assertNotIn("\n", cmd_line)
+
+        content = (
+            "CMDLINE %s\n"
+            "MEM 10.0 100.0\n"
+        ) % cmd_line
+        with tempfile.NamedTemporaryFile('w', suffix='.dat') as tmp_dat:
+            tmp_dat.write(content)
+            tmp_dat.flush()
+            parsed = mprof.read_mprofile_file(tmp_dat.name)
+            self.assertEqual(parsed["mem_usage"], [10.0])
+            self.assertIn("hello\\n\\nworld", parsed["cmd_line"])
+
 
 if __name__ == "__main__":
     unittest.main()