openstack
/
openstack-doc-tools
Code Issues Proposed changes

Merge "Remove unnecessary parameter"

This commit is contained in:
Jenkins 2017-03-20 17:01:36 +00:00 committed by Gerrit Code Review
parent f063e5900a cebdd125e1
commit ca669fa378
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
autogenerate_config_docs/autohelp.py
View File

@ -421,16 +421,12 @@ def _get_category_names(package_name):
return category_names return category_names
def write_files(package_name, options, target, output_format): def write_files(package_name, options, target):
"""Write tables. """Write tables.
Prints a table for every group of options. Prints a table for every group of options.
""" """
if not target: target = target or '../../doc/config-reference/source/tables'
if output_format == 'rst':
target = '../../doc/config-reference/source/tables'
else:
target = '../../doc/common/tables/'
options_by_cat = _get_options_by_cat(package_name) options_by_cat = _get_options_by_cat(package_name)
category_names = _get_category_names(package_name) category_names = _get_category_names(package_name)
@ -502,12 +498,11 @@ def write_files(package_name, options, target, output_format):
env['items'].append(items) env['items'].append(items)
env['table_label'] = package_name + '-' + cat env['table_label'] = package_name + '-' + cat
ext = 'rst' if output_format == 'rst' else 'xml' file_path = ("%(target)s/%(package_name)s-%(cat)s.rst" %
file_path = ("%(target)s/%(package_name)s-%(cat)s.%(ext)s" %
{'target': target, 'package_name': package_name, {'target': target, 'package_name': package_name,
'cat': cat, 'ext': ext}) 'cat': cat})
tmpl_file = os.path.join(os.path.dirname(__file__), tmpl_file = os.path.join(os.path.dirname(__file__),
'templates/autohelp.%s.j2' % output_format) 'templates/autohelp.rst.j2')
with open(tmpl_file) as fd: with open(tmpl_file) as fd:
template = jinja2.Template(fd.read(), trim_blocks=True) template = jinja2.Template(fd.read(), trim_blocks=True)
output = template.render(filename=file_path, **env) output = template.render(filename=file_path, **env)
@ -626,7 +621,7 @@ def main():
update_flagmappings(args.package, options, verbose=args.verbose) update_flagmappings(args.package, options, verbose=args.verbose)
elif args.subcommand == 'rst': elif args.subcommand == 'rst':
write_files(args.package, options, args.target, args.subcommand) write_files(args.package, options, args.target)
elif args.subcommand == 'dump': elif args.subcommand == 'dump':
options.dump() options.dump()