Module: deluge
Branch: 1.3-stable
Commit: 7cc8243849e0273316cb8dd1c863d9980a3edd20
Author: Calum Lind <calumlind+del...@gmail.com>
Date: Fri Dec 7 10:48:56 2012 +0000
Use try-except instead of if statement to gain a little performance
---
deluge/core/torrentmanager.py | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/deluge/core/torrentmanager.py b/deluge/core/torrentmanager.py
index fee10dc..5845243 100644
--- a/deluge/core/torrentmanager.py
+++ b/deluge/core/torrentmanager.py
@@ -553,12 +553,11 @@ class TorrentManager(component.Component):
:raises InvalidTorrentError: if the torrent_id is not in the session
"""
-
- if torrent_id not in self.torrents:
+ try:
+ torrent_name =
self.torrents[torrent_id].get_status(["name"])["name"]
+ except KeyError:
raise InvalidTorrentError("torrent_id not in session")
- torrent_name = self.torrents[torrent_id].get_status(["name"])["name"]
-
# Emit the signal to the clients
component.get("EventManager").emit(PreTorrentRemovedEvent(torrent_id))
@@ -789,10 +788,10 @@ class TorrentManager(component.Component):
Cleans up after libtorrent folder renames.
"""
- if torrent_id not in self.torrents:
- raise InvalidTorrentError("torrent_id is not in session")
-
- info = self.torrents[torrent_id].get_status(['save_path'])
+ try:
+ info = self.torrents[torrent_id].get_status(['save_path'])
+ except KeyError:
+ raise InvalidTorrentError("torrent_id not in session")
# Regex removes leading slashes that causes join function to ignore
save_path
folder_full_path = os.path.join(info['save_path'], re.sub("^/*", "",
folder))
folder_full_path = os.path.normpath(folder_full_path)
--
You received this message because you are subscribed to the Google Groups
"deluge-commit" group.
To post to this group, send email to deluge-commit@googlegroups.com.
To unsubscribe from this group, send email to
deluge-commit+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/deluge-commit?hl=en.
