Merge pull request #81 from aopincar/79_preserve_args_order_in_help

Preserves params order in help screen as in spec
redhat-openstack · Mar 2, 2016 · 90bdc0c · 90bdc0c
2 parents dbed896 + 72e33b0
commit 90bdc0c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/cli/conf.py b/cli/conf.py
@@ -1,9 +1,10 @@
 import ConfigParser
-
-import clg
 import os
 import yaml
 
+import clg
+import yamlordereddictloader
+
 from cli import exceptions
 from cli import utils
 
@@ -62,7 +63,8 @@ def _get_specs(cls, module_name, config):
         """
         res = {}
         for spec_file in cls._get_all_specs(config, subfolder=module_name):
-            spec = yaml.load(open(spec_file))
+            spec = yaml.load(open(spec_file),
+                             Loader=yamlordereddictloader.Loader)
             utils.dict_merge(res, spec)
         return res
 

diff --git a/requirements.txt b/requirements.txt
@@ -5,3 +5,4 @@ PyYAML>=3.11
 configure>=0.5
 colorlog>=2.6.1
 clg>=2.0.0
+yamlordereddictloader>=0.1.1