summaryrefslogtreecommitdiff
path: root/demos/forward.py
diff options
context:
space:
mode:
Diffstat (limited to 'demos/forward.py')
-rw-r--r--demos/forward.py18
1 files changed, 12 insertions, 6 deletions
diff --git a/demos/forward.py b/demos/forward.py
index 5048c775..f1a0c047 100644
--- a/demos/forward.py
+++ b/demos/forward.py
@@ -30,7 +30,11 @@ import getpass
import os
import socket
import select
-import SocketServer
+try:
+ import SocketServer
+except ImportError:
+ import socketserver as SocketServer
+
import sys
from optparse import OptionParser
@@ -54,7 +58,8 @@ class Handler (SocketServer.BaseRequestHandler):
chan = self.ssh_transport.open_channel('direct-tcpip',
(self.chain_host, self.chain_port),
self.request.getpeername())
- except Exception, e:
+ except Exception:
+ e = sys.exc_info()[1]
verbose('Incoming request to %s:%d failed: %s' % (self.chain_host,
self.chain_port,
repr(e)))
@@ -98,7 +103,7 @@ def forward_tunnel(local_port, remote_host, remote_port, transport):
def verbose(s):
if g_verbose:
- print s
+ print(s)
HELP = """\
@@ -165,8 +170,9 @@ 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:
- print '*** Failed to connect to %s:%d: %r' % (server[0], server[1], e)
+ except Exception:
+ e = sys.exc_info()[1]
+ print('*** Failed to connect to %s:%d: %r' % (server[0], server[1], e))
sys.exit(1)
verbose('Now forwarding port %d to %s:%d ...' % (options.port, remote[0], remote[1]))
@@ -174,7 +180,7 @@ def main():
try:
forward_tunnel(options.port, remote[0], remote[1], client.get_transport())
except KeyboardInterrupt:
- print 'C-c: Port forwarding stopped.'
+ print('C-c: Port forwarding stopped.')
sys.exit(0)