Replace list of options with a callback

sebastinas · sebastinas · commit 71c419d5bb33 · 2020-10-25T16:04:27.000+01:00
This will make it easier to later change to argparse.
diff --git a/bpython/args.py b/bpython/args.py
@@ -64,17 +64,19 @@ def parse(args, extras=None, ignore_stdin=False):
     be a tuple of (title, description, options)
         title:          The title for the option group
         description:    A full description of the option group
-        options:        A list of optparse.Option objects to be added to the
-                        group
+        callback:       A callback that adds options to the option group
 
     e.g.:
 
+    def callback(group):
+        group.add_option('-f', action='store_true', dest='f', help='Explode')
+        group.add_option('-l', action='store_true', dest='l', help='Love')
+
     parse(
         ['-i', '-m', 'foo.py'],
         ('Front end-specific options',
         'A full description of what these options are for',
-        [optparse.Option('-f', action='store_true', dest='f', help='Explode'),
-        optparse.Option('-l', action='store_true', dest='l', help='Love')]))
+        callback))
 
 
     Return a tuple of (config, options, exec_args) wherein "config" is the
@@ -125,8 +127,7 @@ def parse(args, extras=None, ignore_stdin=False):
 
     if extras is not None:
         extras_group = OptionGroup(parser, extras[0], extras[1])
-        for option in extras[2]:
-            extras_group.add_option(option)
+        extras[2](extras_group)
         parser.add_option_group(extras_group)
 
     try:
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -1,7 +1,6 @@
 import collections
 import logging
 import sys
-from optparse import Option
 
 import curtsies
 import curtsies.window
@@ -134,25 +133,26 @@ def main(args=None, locals_=None, banner=None, welcome_message=None):
     """
     translations.init()
 
+    def curtsies_arguments(parser):
+        parser.add_argument(
+            "--log",
+            "-L",
+            action="count",
+            help=_("log debug messages to bpython.log"),
+        )
+        parser.add_argument(
+            "--paste",
+            "-p",
+            action="store_true",
+            help=_("start by pasting lines of a file into session"),
+        )
+
     config, options, exec_args = bpargs.parse(
         args,
         (
             "curtsies options",
             None,
-            [
-                Option(
-                    "--log",
-                    "-L",
-                    action="count",
-                    help=_("log debug messages to bpython.log"),
-                ),
-                Option(
-                    "--paste",
-                    "-p",
-                    action="store_true",
-                    help=_("start by pasting lines of a file into session"),
-                ),
-            ],
+            curtsies_arguments,
         ),
     )
     if options.log is None:
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -37,7 +37,6 @@
 import time
 import locale
 import signal
-from optparse import Option
 
 from pygments.token import Token
 
@@ -1120,47 +1119,48 @@ def tab(self, back=False):
 def main(args=None, locals_=None, banner=None):
     translations.init()
 
+    def options_callback(group):
+        group.add_option(
+            "--twisted",
+            "-T",
+            action="store_true",
+            help=_("Run twisted reactor."),
+        )
+        group.add_option(
+            "--reactor",
+            "-r",
+            help=_(
+                "Select specific reactor (see --help-reactors). "
+                "Implies --twisted."
+            ),
+        )
+        group.add_option(
+            "--help-reactors",
+            action="store_true",
+            help=_("List available reactors for -r."),
+        )
+        group.add_option(
+            "--plugin",
+            "-p",
+            help=_(
+                "twistd plugin to run (use twistd for a list). "
+                'Use "--" to pass further options to the plugin.'
+            ),
+        )
+        group.add_option(
+            "--server",
+            "-s",
+            type="int",
+            help=_("Port to run an eval server on (forces Twisted)."),
+        )
+
     # TODO: maybe support displays other than raw_display?
     config, options, exec_args = bpargs.parse(
         args,
         (
             "Urwid options",
             None,
-            [
-                Option(
-                    "--twisted",
-                    "-T",
-                    action="store_true",
-                    help=_("Run twisted reactor."),
-                ),
-                Option(
-                    "--reactor",
-                    "-r",
-                    help=_(
-                        "Select specific reactor (see --help-reactors). "
-                        "Implies --twisted."
-                    ),
-                ),
-                Option(
-                    "--help-reactors",
-                    action="store_true",
-                    help=_("List available reactors for -r."),
-                ),
-                Option(
-                    "--plugin",
-                    "-p",
-                    help=_(
-                        "twistd plugin to run (use twistd for a list). "
-                        'Use "--" to pass further options to the plugin.'
-                    ),
-                ),
-                Option(
-                    "--server",
-                    "-s",
-                    type="int",
-                    help=_("Port to run an eval server on (forces Twisted)."),
-                ),
-            ],
+            options_callback,
         ),
     )
 
