OSDN Git Service

modify LinkObject, LinkPair for JsonExporter
authort.moriyama <t.moriyama@users.sourceforge.jp>
Sat, 20 Jul 2013 18:33:06 +0000 (03:33 +0900)
committert.moriyama <t.moriyama@users.sourceforge.jp>
Sat, 20 Jul 2013 18:33:06 +0000 (03:33 +0900)
linkpair/linkobject.py
linkpair/linkpair.py

index fa2a590..951b0ca 100755 (executable)
@@ -48,8 +48,8 @@ class LinkObject(object):
 
     def __repr__(self):
         return "{\"label\":\"" + self.label + \
-            "\", \"type\":\"" + repr(self.type) + \
-            "\", \"meta\":" + self._blank_dict(self.metadata) + "}"
+            "\",\"type\":\"" + repr(self.type) + \
+            "\",\"meta\":" + self._blank_dict(self.metadata) + "}"
 
     def _blank_dict(self, dict_object):
         if len(dict_object) > 0:
index bbd1494..ab11a26 100755 (executable)
@@ -67,8 +67,8 @@ class LinkPair(object):
             return "\"\""
             
     def to_json(self):
-        return "{ \"device1\":" + repr(self.device1) + ", " + \
-               "  \"device2\":" + repr(self.device2) + ", " + \
-               "  \"port1\":" + repr(self.port1) + ", " + \
-               "  \"port2\":" + repr(self.port2) + ", " + \
-               "  \"format\":" + self._blank_format(self.format_name) + "}"
+        return "{\"device1\":" + repr(self.device1) + "," + \
+               "\"device2\":" + repr(self.device2) + "," + \
+               "\"port1\":" + repr(self.port1) + "," + \
+               "\"port2\":" + repr(self.port2) + "," + \
+               "\"format\":" + self._blank_format(self.format_name) + "}"