From ea9e82f5370831248223d1d671ef131621a1aa9c Mon Sep 17 00:00:00 2001 From: gryf Date: Sat, 4 May 2019 12:39:29 -0600 Subject: [PATCH] Clean up transform code --- transform.py | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/transform.py b/transform.py index f34723f..c03cb57 100644 --- a/transform.py +++ b/transform.py @@ -1,26 +1,27 @@ +import optparse import sys + from docutils.core import publish_parts -from optparse import OptionParser -from docutils.frontend import OptionParser as DocutilsOptionParser +from docutils.frontend import OptionParser from docutils.parsers.rst import Parser + def transform(writer=None, part=None): - p = OptionParser(add_help_option=False) - + p = optparse.OptionParser(add_help_option=False) + # Collect all the command line options - docutils_parser = DocutilsOptionParser(components=(writer, Parser())) + docutils_parser = OptionParser(components=(writer, Parser())) + for group in docutils_parser.option_groups: p.add_option_group(group.title, None).add_options(group.option_list) - + p.add_option('--part', default=part) - + opts, args = p.parse_args() - - settings = dict({ - 'file_insertion_enabled': False, - 'raw_enabled': False, - }, **opts.__dict__) - + + settings = dict({'file_insertion_enabled': False, + 'raw_enabled': False}, **opts.__dict__) + if len(args) == 1: try: content = open(args[0], 'r').read() @@ -28,13 +29,10 @@ def transform(writer=None, part=None): content = args[0] else: content = sys.stdin.read() - - parts = publish_parts( - source=content, - settings_overrides=settings, - writer=writer, - ) - + + parts = publish_parts(source=content, settings_overrides=settings, + writer=writer) + if opts.part in parts: return parts[opts.part] - return '' \ No newline at end of file + return ''