diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-03-05 17:03:37 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-03-05 17:03:37 -0800 |
| commit | b2be63ec623b5944f9b84cac8b8f41aeb2b42fb7 (patch) | |
| tree | 389e17b0c08cd34872a2e3afbc34860ab44fb3ed /paramiko/server.py | |
| parent | bd61c7c0a9a4a2020d0acfb6a01e9ec85bb43b8e (diff) | |
| parent | ae078f51d622931954e47e78029a889c4e721a05 (diff) | |
| download | paramiko-b2be63ec623b5944f9b84cac8b8f41aeb2b42fb7.tar.gz | |
Merge remote-tracking branch 'scottkmaxwell/py3-support-without-py25' into python3
Conflicts:
dev-requirements.txt
paramiko/__init__.py
paramiko/file.py
paramiko/hostkeys.py
paramiko/message.py
paramiko/proxy.py
paramiko/server.py
paramiko/transport.py
paramiko/util.py
paramiko/win_pageant.py
setup.py
Diffstat (limited to 'paramiko/server.py')
| -rw-r--r-- | paramiko/server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/paramiko/server.py b/paramiko/server.py index bf11cda3..ad0acb94 100644 --- a/paramiko/server.py +++ b/paramiko/server.py @@ -514,7 +514,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]) @@ -576,7 +576,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()) |