openstack
/
openstack-doc-tools
Code Issues Proposed changes

Remove unnecessary parameter 

With the removal of docbook support, we now support a single type of
output. As such, the aforementioned option is surplus to requirements
and can be removed. Do just this.

Change-Id: Ib9d49fd465ecceb92075495de966b2189a371103
This commit is contained in:
Stephen Finucane 2017-03-07 11:46:44 +00:00
parent 53ecf9a455
commit 3ced197c9d
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

@ -429,16 +429,12 @@ def _remove_prefix(text, prefix):
return text
def write_files(package_name, options, target, output_format):
def write_files(package_name, options, target):
"""Write tables.
Prints a table for every group of options.
"""
if not target:
if output_format == 'rst':
target = '../../doc/config-reference/source/tables'
else:
target = '../../doc/common/tables/'
target = target or '../../doc/config-reference/source/tables'
options_by_cat = _get_options_by_cat(package_name)
category_names = _get_category_names(package_name)
@ -516,12 +512,11 @@ def write_files(package_name, options, target, output_format):
env['items'].append(items)
env['table_label'] = package_name + '-' + cat
ext = 'rst' if output_format == 'rst' else 'xml'
file_path = ("%(target)s/%(package_name)s-%(cat)s.%(ext)s" %
file_path = ("%(target)s/%(package_name)s-%(cat)s.rst" %
{'target': target, 'package_name': package_name,
'cat': cat, 'ext': ext})
'cat': cat})
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:
template = jinja2.Template(fd.read(), trim_blocks=True)
output = template.render(filename=file_path, **env)
@ -640,7 +635,7 @@ def main():
update_flagmappings(args.package, options, verbose=args.verbose)
elif args.subcommand == 'rst':
write_files(args.package, options, args.target, args.subcommand)
write_files(args.package, options, args.target)
elif args.subcommand == 'dump':
options.dump()