Add --twisted to bpython.urwid and use it for --plugin and --server.

Jan Pobříslo · Jan Pobříslo · commit f56a8252ff83 · 2012-08-29T15:51:33.000+02:00
This uses the currently installed reactor (and installs the default
implicitly if necessary), as opposed to explicitly installing a
default reactor. This is useful for some bpython embedding usecases
where a reactor is already installed by the time bpython.urwid.main()
is called, and it fixes a bug where bpython defaults to the select
reactor instead of twisted's default.
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -1103,8 +1103,11 @@ def main(args=None, locals_=None, banner=None):
     # 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=_('Run a reactor (see --help-reactors).')),
+                       help=_('Select specific reactor (see --help-reactors). '
+                       'Implies --twisted.')),
                 Option('--help-reactors', action='store_true',
                        help=_('List available reactors for -r.')),
                 Option('--plugin', '-p',
@@ -1133,8 +1136,8 @@ def main(args=None, locals_=None, banner=None):
             ('bold ' + name, color + ',bold', background, monochrome)
             for name, color, background, monochrome in palette])
 
-    if (options.server or options.plugin) and not options.reactor:
-        options.reactor = 'select'
+    if options.server or options.plugin:
+        options.twisted = True
 
     if options.reactor:
         try:
@@ -1153,6 +1156,14 @@ def main(args=None, locals_=None, banner=None):
                     options.reactor,))
             return
         event_loop = TwistedEventLoop(reactor)
+    elif options.twisted:
+        try:
+            from twisted.internet import reactor
+        except ImportError:
+            sys.stderr.write('No reactors are available. Please install '
+                'twisted for reactor support.\n')
+            return
+        event_loop = TwistedEventLoop(reactor)
     else:
         # None, not urwid.SelectEventLoop(), to work with
         # screens that do not support external event loops.
