Change all exceptions to modern format (not Py2.5 compatible)

1 files changed, 2 insertions, 4 deletions

diff --git a/demos/forward.py b/demos/forward.py
index f1a0c047..96e1700d 100644
--- a/demos/forward.py
+++ b/demos/forward.py
@@ -58,8 +58,7 @@ class Handler (SocketServer.BaseRequestHandler):
             chan = self.ssh_transport.open_channel('direct-tcpip',
                                                    (self.chain_host, self.chain_port),
                                                    self.request.getpeername())
-        except Exception:
-            e = sys.exc_info()[1]
+        except Exception as e:
             verbose('Incoming request to %s:%d failed: %s' % (self.chain_host,
                                                               self.chain_port,
                                                               repr(e)))
@@ -170,8 +169,7 @@ def main():
     try:
         client.connect(server[0], server[1], username=options.user, key_filename=options.keyfile,
                        look_for_keys=options.look_for_keys, password=password)
-    except Exception:
-        e = sys.exc_info()[1]
+    except Exception as e:
         print('*** Failed to connect to %s:%d: %r' % (server[0], server[1], e))
         sys.exit(1)