Merge branch scottkmaxwell:py3-support-without-py25 into

SebastianDeiss:gssapi-py3-support

1 files changed, 2 insertions, 2 deletions

diff --git a/paramiko/server.py b/paramiko/server.py
index fdb40942..a922201d 100644
--- a/paramiko/server.py
+++ b/paramiko/server.py
@@ -48,7 +48,7 @@ class InteractiveQuery (object):
         self.instructions = instructions
         self.prompts = []
         for x in prompts:
-            if (type(x) is str) or (type(x) is unicode):
+            if isinstance(x, string_types):
                 self.add_prompt(x)
             else:
                 self.add_prompt(x[0], x[1])
@@ -623,7 +623,7 @@ class SubsystemHandler (threading.Thread):
         try:
             self.__transport._log(DEBUG, 'Starting handler for subsystem %s' % self.__name)
             self.start_subsystem(self.__name, self.__transport, self.__channel)
-        except Exception, e:
+        except Exception as e:
             self.__transport._log(ERROR, 'Exception in subsystem handler for "%s": %s' %
                                   (self.__name, str(e)))
             self.__transport._log(ERROR, util.tb_strings())