Cleanup generator, expose a to_json_dict.

swift-nav · Apr 15, 2015 · a3e397c · a3e397c
1 parent 9511935
commit a3e397c
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/generator/sbpg/targets/resources/sbp_construct_template.py.j2 b/generator/sbpg/targets/resources/sbp_construct_template.py.j2
@@ -146,15 +146,6 @@ class ((( m.identifier | classnameify )))(SBP):
     self.payload = ((( m.identifier | classnameify )))._parser.build(c)
     return self.pack()
 
-  def to_json(self):
-    """Produce a JSON-encoded SBP message.
-
-    """
-    d = super( ((( m.identifier | classnameify ))), self).to_json_dict()
-    j = walk_json_dict(exclude_fields(self))
-    d.update(j)
-    return json.dumps(d)
-
   @staticmethod
   def from_json(s):
     """Given a JSON-encoded string s, build a message object.
@@ -163,6 +154,12 @@ class ((( m.identifier | classnameify )))(SBP):
     d = json.loads(data)
     sbp = SBP.from_json_dict(d)
     return ((( m.identifier | classnameify )))(sbp)
+
+  def to_json_dict(self):
+    d = super( ((( m.identifier | classnameify ))), self).to_json_dict()
+    j = walk_json_dict(exclude_fields(self))
+    d.update(j)
+    return d
     ((*- endif *))
     ((* endif *))
   ((*- else *))