layout tweaks
diff --git a/reclass/cli.py b/reclass/cli.py
index 48ce31f..15df811 100644
--- a/reclass/cli.py
+++ b/reclass/cli.py
@@ -25,17 +25,13 @@
}
defaults.update(find_and_read_configfile())
- options = get_options(RECLASS_NAME, VERSION, DESCRIPTION,
- defaults=defaults)
-
+ options = get_options(RECLASS_NAME, VERSION, DESCRIPTION, defaults=defaults)
storage = get_storage(options.storage_type, options.nodes_uri, options.classes_uri)
-
class_mappings = defaults.get('class_mappings')
reclass = Core(storage, class_mappings, default_environment='base')
if options.mode == MODE_NODEINFO:
data = reclass.nodeinfo(options.nodename)
-
else:
data = reclass.inventory()
diff --git a/reclass/config.py b/reclass/config.py
index 6043b41..2653586 100644
--- a/reclass/config.py
+++ b/reclass/config.py
@@ -21,8 +21,7 @@
default=defaults.get('storage_type', OPT_STORAGE_TYPE),
help='the type of storage backend to use [%default]')
ret.add_option('-b', '--inventory-base-uri', dest='inventory_base_uri',
- default=defaults.get('inventory_base_uri',
- OPT_INVENTORY_BASE_URI),
+ default=defaults.get('inventory_base_uri', OPT_INVENTORY_BASE_URI),
help='the base URI to prepend to nodes and classes [%default]'),
ret.add_option('-u', '--nodes-uri', dest='nodes_uri',
default=defaults.get('nodes_uri', OPT_NODES_URI),
@@ -39,8 +38,7 @@
ret.add_option('-o', '--output', dest='output',
default=defaults.get('output', OPT_OUTPUT),
help='output format (yaml or json) [%default]')
- ret.add_option('-y', '--pretty-print', dest='pretty_print',
- action="store_true",
+ ret.add_option('-y', '--pretty-print', dest='pretty_print', action="store_true",
default=defaults.get('pretty_print', OPT_PRETTY_PRINT),
help='try to make the output prettier [%default]')
ret.add_option('-r', '--no-refs', dest='no_refs', action="store_true",