Make bpython.urwid's twisted support work with urwid 1.0.0 and up.

Marien Zwart · Marien Zwart · commit e158b4057011 · 2011-09-27T22:55:47.000+02:00
This just disables a workaround for a bug fixed in newer urwids. The
workaround involved copying code from urwid, and that code changed,
causing our workaround to break things.
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -112,35 +112,38 @@ def buildProtocol(self, addr):
             return EvalProtocol(self.repl)
 
 
-class TwistedEventLoop(urwid.TwistedEventLoop):
-
-    """TwistedEventLoop modified to properly stop the reactor.
-
-    urwid 0.9.9 and 0.9.9.1 crash the reactor on ExitMainLoop instead
-    of stopping it. One obvious way this breaks is if anything used
-    the reactor's thread pool: that thread pool is not shut down if
-    the reactor is not stopped, which means python hangs on exit
-    (joining the non-daemon threadpool threads that never exit). And
-    the default resolver is the ThreadedResolver, so if we looked up
-    any names we hang on exit. That is bad enough that we hack up
-    urwid a bit here to exit properly.
-    """
+if urwid.VERSION < (1, 0, 0):
+    class TwistedEventLoop(urwid.TwistedEventLoop):
+
+        """TwistedEventLoop modified to properly stop the reactor.
+
+        urwid 0.9.9 and 0.9.9.1 crash the reactor on ExitMainLoop instead
+        of stopping it. One obvious way this breaks is if anything used
+        the reactor's thread pool: that thread pool is not shut down if
+        the reactor is not stopped, which means python hangs on exit
+        (joining the non-daemon threadpool threads that never exit). And
+        the default resolver is the ThreadedResolver, so if we looked up
+        any names we hang on exit. That is bad enough that we hack up
+        urwid a bit here to exit properly.
+        """
 
-    def handle_exit(self, f):
-        def wrapper(*args, **kwargs):
-            try:
-                return f(*args, **kwargs)
-            except urwid.ExitMainLoop:
-                # This is our change.
-                self.reactor.stop()
-            except:
-                # This is the same as in urwid.
-                # We are obviously not supposed to ever hit this.
-                import sys
-                print sys.exc_info()
-                self._exc_info = sys.exc_info()
-                self.reactor.crash()
-        return wrapper
+        def handle_exit(self, f):
+            def wrapper(*args, **kwargs):
+                try:
+                    return f(*args, **kwargs)
+                except urwid.ExitMainLoop:
+                    # This is our change.
+                    self.reactor.stop()
+                except:
+                    # This is the same as in urwid.
+                    # We are obviously not supposed to ever hit this.
+                    import sys
+                    print sys.exc_info()
+                    self._exc_info = sys.exc_info()
+                    self.reactor.crash()
+            return wrapper
+else:
+    TwistedEventLoop = urwid.TwistedEventLoop
 
 
 class Statusbar(object):
