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

6 files changed, 11 insertions, 22 deletions

diff --git a/demos/demo.py b/demos/demo.py
index 2f245baf..fff61784 100755
--- a/demos/demo.py
+++ b/demos/demo.py
@@ -113,8 +113,7 @@ if hostname.find(':') >= 0:
 try:
     sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     sock.connect((hostname, port))
-except Exception:
-    e = sys.exc_info()[1]
+except Exception as e:
     print('*** Connect failed: ' + str(e))
     traceback.print_exc()
     sys.exit(1)
@@ -171,8 +170,7 @@ try:
     chan.close()
     t.close()
 
-except Exception:
-    e = sys.exc_info()[1]
+except Exception as e:
     print('*** Caught exception: ' + str(e.__class__) + ': ' + str(e))
     traceback.print_exc()
     try:
diff --git a/demos/demo_server.py b/demos/demo_server.py
index 5a41a714..34a9bd5e 100644
--- a/demos/demo_server.py
+++ b/demos/demo_server.py
@@ -84,8 +84,7 @@ try:
     sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
     sock.bind(('', 2200))
-except Exception:
-    e = sys.exc_info()[1]
+except Exception as e:
     print('*** Bind failed: ' + str(e))
     traceback.print_exc()
     sys.exit(1)
@@ -94,8 +93,7 @@ try:
     sock.listen(100)
     print('Listening for connection ...')
     client, addr = sock.accept()
-except Exception:
-    e = sys.exc_info()[1]
+except Exception as e:
     print('*** Listen/accept failed: ' + str(e))
     traceback.print_exc()
     sys.exit(1)
@@ -138,8 +136,7 @@ try:
     chan.send('\r\nI don\'t like you, ' + username + '.\r\n')
     chan.close()
 
-except Exception:
-    e = sys.exc_info()[1]
+except Exception as e:
     print('*** Caught exception: ' + str(e.__class__) + ': ' + str(e))
     traceback.print_exc()
     try:
diff --git a/demos/demo_sftp.py b/demos/demo_sftp.py
index d7f28084..1cccffc2 100755
--- a/demos/demo_sftp.py
+++ b/demos/demo_sftp.py
@@ -114,8 +114,7 @@ try:
 
     t.close()
 
-except Exception:
-    e = sys.exc_info()[1]
+except Exception as e:
     print('*** Caught exception: %s: %s' % (e.__class__, e))
     traceback.print_exc()
     try:
diff --git a/demos/demo_simple.py b/demos/demo_simple.py
index fb71145d..ae631e43 100755
--- a/demos/demo_simple.py
+++ b/demos/demo_simple.py
@@ -77,8 +77,7 @@ try:
     chan.close()
     client.close()
 
-except Exception:
-    e = sys.exc_info()[1]
+except Exception as e:
     print('*** Caught exception: %s: %s' % (e.__class__, e))
     traceback.print_exc()
     try:
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)
 
diff --git a/demos/rforward.py b/demos/rforward.py
index fcffbcb1..ae70670c 100755
--- a/demos/rforward.py
+++ b/demos/rforward.py
@@ -46,8 +46,7 @@ def handler(chan, host, port):
     sock = socket.socket()
     try:
         sock.connect((host, port))
-    except Exception:
-        e = sys.exc_info()[1]
+    except Exception as e:
         verbose('Forwarding request to %s:%d failed: %r' % (host, port, e))
         return
     
@@ -151,8 +150,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)