Switch to ruamel.yaml.

Author: j-bennet

changelog.rst

@@ -1,7 +1,7 @@
 Upcoming
 ========
 
-* Use pyyaml to format hierarchical info.
+* Use ``ruamel.yaml`` to format hierarchical info.
 
 0.10
 ====

setup.py

@@ -24,7 +24,7 @@
         'configobj>=5.0.6',
         'pexpect>=3.3',
         'fuzzyfinder>=1.0.0',
-        'PyYAML>=3.13'
+        'ruamel.yaml>=0.15.72',
     ],
     extras_require={
         'testing': [

wharfee/formatter.py

@@ -12,7 +12,12 @@
 from pygments import highlight
 from pygments.lexers.data import JsonLexer
 from pygments.formatters.terminal import TerminalFormatter
-from yaml import dump
+from ruamel.yaml import YAML
+
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
 
 # Python 3 has no 'basestring' or 'long' type we're checking for.
 try:
@@ -212,8 +217,12 @@ def format_data(command, data):
 
 
 def format_struct(data, indent=4):
-    text = dump(data, indent=indent, default_flow_style=False)
-    lines = text.split('\n')
+    output = StringIO()
+    yaml = YAML()
+    yaml.default_flow_style = False
+    yaml.indent = indent
+    yaml.dump(data, stream=output)
+    lines = output.getvalue().split('\n')
     return lines