pots.py: Use morph_dump() when outputting the exported <target>.ymltristan/clean-output

This ensures consistent ordering of output, dictated by defaults.conf,
and also ensures clean output without escaping strings.

1 files changed, 2 insertions, 12 deletions

diff --git a/ybd/pots.py b/ybd/pots.py
index a66686e..d3641fb 100644
--- a/ybd/pots.py
+++ b/ybd/pots.py
@@ -20,16 +20,7 @@ import copy
 from app import config, log
 from defaults import Defaults
 from morphs import Morphs
-
-
-# copied from http://stackoverflow.com/questions/21016220
-class ExplicitDumper(yaml.SafeDumper):
-    """
-    A dumper that will never emit aliases.
-    """
-
-    def ignore_aliases(self, data):
-        return True
+from morphdumper import morph_dump
 
 
 class Pots(object):
@@ -73,8 +64,7 @@ class Pots(object):
                 del value['orig_ref']
 
         with open(filename, 'w') as f:
-            f.write(yaml.dump(data, default_flow_style=False,
-                              Dumper=ExplicitDumper))
+            f.write(morph_dump(data, self.defaults))
         log('CHECK', 'Saved yaml definitions at', filename)
 
     def _load_pots(self, filename):