diff options
author | Matthew Peveler <matt.peveler@gmail.com> | 2020-07-21 10:53:18 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-21 10:53:18 -0400 |
commit | 98186ac9082f53c671c18f32f7a0653dad8ae35b (patch) | |
tree | 66c3e3a43041fcb3e3330516b7ac110fe6fe43ba | |
parent | bbd7ff51f3de191f13699553a819096d5b62496a (diff) | |
download | asciidoc-py3-98186ac9082f53c671c18f32f7a0653dad8ae35b.tar.gz |
Revert "Moving a2x from optparse to argparse (#34)" (#128)
This reverts commit e3fd0a7de6fe0f24f8e671720bf3c9ed9c18005e.
-rwxr-xr-x | a2x.py | 75 |
1 files changed, 39 insertions, 36 deletions
@@ -892,119 +892,122 @@ class A2X(AttrDict): if __name__ == '__main__': description = '''A toolchain manager for AsciiDoc (converts Asciidoc text files to other file formats)''' - from argparse import ArgumentParser - parser = ArgumentParser(usage='usage: %(prog)s [OPTIONS] ASCIIDOC_FILE', + from optparse import OptionParser + parser = OptionParser(usage='usage: %prog [OPTIONS] SOURCE_FILE', + version='%s %s' % (PROG,VERSION), description=description) - parser.add_argument('--version', action='version', version='{} {}'.format(PROG, VERSION)) - parser.add_argument('-a', '--attribute', + parser.add_option('-a', '--attribute', action='append', dest='attributes', default=[], metavar='ATTRIBUTE', help='set asciidoc attribute value') - parser.add_argument('--asciidoc-opts', + parser.add_option('--asciidoc-opts', action='append', dest='asciidoc_opts', default=[], metavar='ASCIIDOC_OPTS', help='asciidoc options') #DEPRECATED - parser.add_argument('--copy', + parser.add_option('--copy', action='store_true', dest='copy', default=False, help='DEPRECATED: does nothing') - parser.add_argument('--conf-file', + parser.add_option('--conf-file', dest='conf_file', default=None, metavar='CONF_FILE', help='configuration file') - parser.add_argument('-D', '--destination-dir', + parser.add_option('-D', '--destination-dir', action='store', dest='destination_dir', default=None, metavar='PATH', - help='output directory (defaults to ASCIIDOC_FILE directory)') - parser.add_argument('-d','--doctype', + help='output directory (defaults to SOURCE_FILE directory)') + parser.add_option('-d','--doctype', action='store', dest='doctype', metavar='DOCTYPE', choices=('article','manpage','book'), help='article, manpage, book') - parser.add_argument('-b','--backend', + parser.add_option('-b','--backend', action='store', dest='backend', metavar='BACKEND', help='name of backend plugin') - parser.add_argument('--epubcheck', + parser.add_option('--epubcheck', action='store_true', dest='epubcheck', default=False, help='check EPUB output with epubcheck') - parser.add_argument('-f','--format', + parser.add_option('-f','--format', action='store', dest='format', metavar='FORMAT', default = 'pdf', choices=('chunked','epub','htmlhelp','manpage','pdf', 'text', 'xhtml','dvi','ps','tex','docbook'), help='chunked, epub, htmlhelp, manpage, pdf, text, xhtml, dvi, ps, tex, docbook') - parser.add_argument('--icons', + parser.add_option('--icons', action='store_true', dest='icons', default=False, help='use admonition, callout and navigation icons') - parser.add_argument('--icons-dir', + parser.add_option('--icons-dir', action='store', dest='icons_dir', default=None, metavar='PATH', help='admonition and navigation icon directory') - parser.add_argument('-k', '--keep-artifacts', + parser.add_option('-k', '--keep-artifacts', action='store_true', dest='keep_artifacts', default=False, help='do not delete temporary build files') - parser.add_argument('--lynx', + parser.add_option('--lynx', action='store_true', dest='lynx', default=False, help='use lynx to generate text files') - parser.add_argument('-L', '--no-xmllint', + parser.add_option('-L', '--no-xmllint', action='store_true', dest='no_xmllint', default=False, help='do not check asciidoc output with xmllint') - parser.add_argument('-n','--dry-run', + parser.add_option('-n','--dry-run', action='store_true', dest='dry_run', default=False, help='just print the commands that would have been executed') - parser.add_argument('-r','--resource', + parser.add_option('-r','--resource', action='append', dest='resources', default=[], metavar='PATH', help='resource file or directory containing resource files') - parser.add_argument('-m', '--resource-manifest', + parser.add_option('-m', '--resource-manifest', action='store', dest='resource_manifest', default=None, metavar='FILE', help='read resources from FILE') #DEPRECATED - parser.add_argument('--resource-dir', + parser.add_option('--resource-dir', action='append', dest='resources', default=[], metavar='PATH', help='DEPRECATED: use --resource') #DEPRECATED - parser.add_argument('-s','--skip-asciidoc', + parser.add_option('-s','--skip-asciidoc', action='store_true', dest='skip_asciidoc', default=False, help='DEPRECATED: redundant') - parser.add_argument('--stylesheet', + parser.add_option('--stylesheet', action='store', dest='stylesheet', default=None, metavar='STYLESHEET', help='HTML CSS stylesheet file name') #DEPRECATED - parser.add_argument('--safe', + parser.add_option('--safe', action='store_true', dest='safe', default=False, help='DEPRECATED: does nothing') - parser.add_argument('--dblatex-opts', + parser.add_option('--dblatex-opts', action='append', dest='dblatex_opts', default=[], metavar='DBLATEX_OPTS', help='dblatex options') - parser.add_argument('--backend-opts', + parser.add_option('--backend-opts', action='append', dest='backend_opts', default=[], metavar='BACKEND_OPTS', help='backend plugin options') - parser.add_argument('--fop', + parser.add_option('--fop', action='store_true', dest='fop', default=False, help='use FOP to generate PDF files') - parser.add_argument('--fop-opts', + parser.add_option('--fop-opts', action='append', dest='fop_opts', default=[], metavar='FOP_OPTS', help='options for FOP pdf generation') - parser.add_argument('--xsltproc-opts', + parser.add_option('--xsltproc-opts', action='append', dest='xsltproc_opts', default=[], metavar='XSLTPROC_OPTS', help='xsltproc options for XSL stylesheets') - parser.add_argument('--xsl-file', + parser.add_option('--xsl-file', action='store', dest='xsl_file', metavar='XSL_FILE', help='custom XSL stylesheet') - parser.add_argument('-v', '--verbose', + parser.add_option('-v', '--verbose', action='count', dest='verbose', default=0, help='increase verbosity') - parser.add_argument("asciidoc_file", action="store", help="AsciiDoc source file") + if len(sys.argv) == 1: + parser.parse_args(['--help']) source_options = get_source_options(sys.argv[-1]) argv = source_options + sys.argv[1:] - opts = parser.parse_args(argv) + opts, args = parser.parse_args(argv) + if len(args) != 1: + parser.error('incorrect number of arguments') opts.asciidoc_opts = ' '.join(opts.asciidoc_opts) opts.dblatex_opts = ' '.join(opts.dblatex_opts) opts.fop_opts = ' '.join(opts.fop_opts) opts.xsltproc_opts = ' '.join(opts.xsltproc_opts) opts.backend_opts = ' '.join(opts.backend_opts) - opts = vars(opts) # Convert argparse.Values to dict. + opts = eval(str(opts)) # Convert optparse.Values to dict. a2x = A2X(opts) OPTIONS = a2x # verbose and dry_run used by utility functions. verbose('args: %r' % argv) - a2x.asciidoc_file = opts['asciidoc_file'] + a2x.asciidoc_file = args[0] try: a2x.load_conf() a2x.execute() |