m-labs · Jan 27, 2016 · Jan 27, 2016 · Jan 27, 2016
Showing with 7 additions and 4 deletions.

+1 −1 artiq/gui/experiments.py

+1 −1 artiq/protocols/logging.py

+4 −1 artiq/protocols/pyon.py

+1 −1 artiq/test/serialization.py
diff --git a/artiq/gui/experiments.py b/artiq/gui/experiments.py
@@ -240,7 +240,7 @@ def restore_state(self, state):
 class _ExperimentDock(dockarea.Dock):
     def __init__(self, manager, expurl):
         dockarea.Dock.__init__(self, "Exp: " + expurl, closable=True)
-        self.setMinimumSize(QtCore.QSize(1100, 700))
+        self.setMinimumSize(QtCore.QSize(740, 470))
         self.layout.setSpacing(5)
         self.layout.setContentsMargins(5, 5, 5, 5)
 

diff --git a/artiq/protocols/logging.py b/artiq/protocols/logging.py
@@ -78,7 +78,7 @@ async def stream_task(self, stream):
                 entry = (await stream.readline())
                 if not entry:
                     break
-                self.line_input(entry[:-1].decode())
+                self.line_input(entry.decode().rstrip("\r\n"))
             except:
                 logger.debug("exception in log forwarding", exc_info=True)
                 break

diff --git a/artiq/protocols/pyon.py b/artiq/protocols/pyon.py
@@ -74,7 +74,10 @@ def encode_number(self, x):
 
     def encode_str(self, x):
         # Do not use repr() for JSON compatibility.
-        tt = {ord("\""): "\\\"", ord("\\"): "\\\\", ord("\n"): "\\n"}
+        tt = {
+              ord("\""): "\\\"", ord("\\"): "\\\\",
+              ord("\n"): "\\n", ord("\r"): "\\r"
+        }
         return "\"" + x.translate(tt) + "\""
 
     def encode_bytes(self, x):

diff --git a/artiq/test/serialization.py b/artiq/test/serialization.py
@@ -26,7 +26,7 @@ def test_encdec(self):
 _json_test_object = {
     "a": "b",
     "x": [1, 2, {}],
-    "foo\nbaz\\qux\"": ["bar", 1.2, {"x": "y"}],
+    "foo\nbaz\\qux\"\r2": ["bar", 1.2, {"x": "y"}],
     "bar": [True, False, None]
 }