summaryrefslogtreecommitdiffstats
path: root/deluge/transfer.py
diff options
context:
space:
mode:
authorCalum Lind <calumlind+deluge@gmail.com>2014-09-03 13:23:28 +0100
committerCalum Lind <calumlind+deluge@gmail.com>2014-09-03 17:22:38 +0100
commit1e6c811768992f4b46ba2e1da335cb966bb93f45 (patch)
treedc27ab981fc699e98c2120f96a9824fff09f14d4 /deluge/transfer.py
parent95f859673ee2d0cfb052f92f8341aa4cf89ae57a (diff)
downloaddeluge-1e6c811768992f4b46ba2e1da335cb966bb93f45.tar.gz
deluge-1e6c811768992f4b46ba2e1da335cb966bb93f45.tar.bz2
deluge-1e6c811768992f4b46ba2e1da335cb966bb93f45.zip
[Python-Modernize] lib2to3.fixes.fix_except
* Use 'ex' instead of 'e' to conform with pylint * Minimal Flake8 on some files
Diffstat (limited to 'deluge/transfer.py')
-rw-r--r--deluge/transfer.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/deluge/transfer.py b/deluge/transfer.py
index 836b0cee2..bf5ec0ad4 100644
--- a/deluge/transfer.py
+++ b/deluge/transfer.py
@@ -127,8 +127,8 @@ class DelugeTransferProtocol(Protocol):
raise Exception("Message length is negative: %d" % self._message_length)
# Remove the header from the buffer
self._buffer = self._buffer[MESSAGE_HEADER_SIZE:]
- except Exception, e:
- log.warn("Error occurred when parsing message header: %s." % str(e))
+ except Exception as ex:
+ log.warn("Error occurred when parsing message header: %s.", ex)
log.warn("This version of Deluge cannot communicate with the sender of this data.")
self._message_length = 0
self._buffer = ""
@@ -142,9 +142,8 @@ class DelugeTransferProtocol(Protocol):
"""
try:
self.message_received(rencode.loads(zlib.decompress(data), decode_utf8=True))
- except Exception, e:
- log.warn("Failed to decompress (%d bytes) and load serialized data "\
- "with rencode: %s" % (len(data), str(e)))
+ except Exception as ex:
+ log.warn("Failed to decompress (%d bytes) and load serialized data with rencode: %s", len(data), ex)
def get_bytes_recv(self):
"""