From 7cdbbf4bdc864bfbbab019787857a9a06d14d7e8 Mon Sep 17 00:00:00 2001
From: Scott Maxwell <scott@codecobblers.com>
Date: Wed, 30 Oct 2013 17:15:25 -0700
Subject: [PATCH] Fix input

---
 demos/demo.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/demos/demo.py b/demos/demo.py
index 3890eda..744b5c3 100755
--- a/demos/demo.py
+++ b/demos/demo.py
@@ -59,13 +59,13 @@ def agent_auth(transport, username):
 
 def manual_auth(username, hostname):
     default_auth = 'p'
-    auth = raw_input('Auth by (p)assword, (r)sa key, or (d)ss key? [%s] ' % default_auth)
+    auth = input('Auth by (p)assword, (r)sa key, or (d)ss key? [%s] ' % default_auth)
     if len(auth) == 0:
         auth = default_auth
 
     if auth == 'r':
         default_path = os.path.join(os.environ['HOME'], '.ssh', 'id_rsa')
-        path = raw_input('RSA key [%s]: ' % default_path)
+        path = input('RSA key [%s]: ' % default_path)
         if len(path) == 0:
             path = default_path
         try:
@@ -76,7 +76,7 @@ def manual_auth(username, hostname):
         t.auth_publickey(username, key)
     elif auth == 'd':
         default_path = os.path.join(os.environ['HOME'], '.ssh', 'id_dsa')
-        path = raw_input('DSS key [%s]: ' % default_path)
+        path = input('DSS key [%s]: ' % default_path)
         if len(path) == 0:
             path = default_path
         try:
@@ -99,7 +99,7 @@ if len(sys.argv) > 1:
     if hostname.find('@') >= 0:
         username, hostname = hostname.split('@')
 else:
-    hostname = raw_input('Hostname: ')
+    hostname = input('Hostname: ')
 if len(hostname) == 0:
     print('*** Hostname required.')
     sys.exit(1)
@@ -112,8 +112,8 @@ if hostname.find(':') >= 0:
 try:
     sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     sock.connect((hostname, port))
-except Exception, e:
-    print '*** Connect failed: ' + str(e)
+except Exception:
+    e = sys.exc_info()[1]
     print('*** Connect failed: ' + str(e))
     traceback.print_exc()
     sys.exit(1)
@@ -150,7 +150,7 @@ try:
     # get username
     if username == '':
         default_username = getpass.getuser()
-        username = raw_input('Username [%s]: ' % default_username)
+        username = input('Username [%s]: ' % default_username)
         if len(username) == 0:
             username = default_username