Make bpython.urwid work better without Twisted installed.

Marien Zwart · Marien Zwart · commit 6367a85aaef5 · 2012-10-18T21:12:23.000+02:00
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -113,7 +113,10 @@ def buildProtocol(self, addr):
             return EvalProtocol(self.repl)
 
 
-if urwid.VERSION < (1, 0, 0):
+# If Twisted is not available urwid has no TwistedEventLoop attribute.
+# Code below will try to import reactor before using TwistedEventLoop.
+# I assume TwistedEventLoop will be available if that import succeeds.
+if urwid.VERSION < (1, 0, 0) and hasattr(urwid, 'TwistedEventLoop'):
     class TwistedEventLoop(urwid.TwistedEventLoop):
 
         """TwistedEventLoop modified to properly stop the reactor.
@@ -144,7 +147,7 @@ def wrapper(*args, **kwargs):
                     self.reactor.crash()
             return wrapper
 else:
-    TwistedEventLoop = urwid.TwistedEventLoop
+    TwistedEventLoop = getattr(urwid, 'TwistedEventLoop', None)
 
 
 class StatusbarEdit(urwid.Edit):
