summaryrefslogtreecommitdiff
path: root/paramiko/sftp_server.py
diff options
context:
space:
mode:
authorScott Maxwell <scott@codecobblers.com>2013-11-19 08:06:35 -0800
committerScott Maxwell <scott@codecobblers.com>2013-11-19 08:06:35 -0800
commit25dd096da065b1bc2f35c1a62d8a7055b022818b (patch)
tree94e87015ebcb83660452c79093e1ac407e360306 /paramiko/sftp_server.py
parent3ce336c88b7bfbfad03fab17bff8cb3c3a77176c (diff)
downloadparamiko-25dd096da065b1bc2f35c1a62d8a7055b022818b.tar.gz
Change all exceptions to modern format (not Py2.5 compatible)
Diffstat (limited to 'paramiko/sftp_server.py')
-rw-r--r--paramiko/sftp_server.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/paramiko/sftp_server.py b/paramiko/sftp_server.py
index 38adc63c..7dcef6b4 100644
--- a/paramiko/sftp_server.py
+++ b/paramiko/sftp_server.py
@@ -92,8 +92,7 @@ class SFTPServer (BaseSFTP, SubsystemHandler):
except EOFError:
self._log(DEBUG, 'EOF -- end of session')
return
- except Exception:
- e = sys.exc_info()[1]
+ except Exception as e:
self._log(DEBUG, 'Exception on channel: ' + str(e))
self._log(DEBUG, util.tb_strings())
return
@@ -101,8 +100,7 @@ class SFTPServer (BaseSFTP, SubsystemHandler):
request_number = msg.get_int()
try:
self._process(t, request_number, msg)
- except Exception:
- e = sys.exc_info()[1]
+ except Exception as e:
self._log(DEBUG, 'Exception in server processing: ' + str(e))
self._log(DEBUG, util.tb_strings())
# send some kind of failure message, at least