diff --git a/deluge/core/pluginmanager.py b/deluge/core/pluginmanager.py index 8c4079a7f..3196b8d84 100644 --- a/deluge/core/pluginmanager.py +++ b/deluge/core/pluginmanager.py @@ -73,13 +73,8 @@ class PluginManager: def shutdown(self): log.debug("PluginManager shutting down..") - # Del all plugins to allow them to deconstruct properly for plugin in self.plugins.values(): plugin.core.shutdown() - # del plugin - #while plugin is not None: - # del plugin - del self.plugins def __getitem__(self, key): diff --git a/deluge/plugins/queue/queue/__init__.py b/deluge/plugins/queue/queue/__init__.py index d5e50baad..8f6655e0e 100644 --- a/deluge/plugins/queue/queue/__init__.py +++ b/deluge/plugins/queue/queue/__init__.py @@ -31,13 +31,10 @@ # this exception statement from your version. If you delete this exception # statement from all source files in the program, then also delete it here. -import logging - from core import Core from gtkui import GtkUI -# Get the logger -log = logging.getLogger("deluge") +from deluge.log import LOG as log class CorePlugin: def __init__(self, plugin_manager): diff --git a/deluge/plugins/queue/queue/torrentqueue.py b/deluge/plugins/queue/queue/torrentqueue.py index 9a5e6de52..75033ef9c 100644 --- a/deluge/plugins/queue/queue/torrentqueue.py +++ b/deluge/plugins/queue/queue/torrentqueue.py @@ -58,7 +58,6 @@ class TorrentQueue: except IOError: log.warning("Unable to load queue state file.") - def save_state(self): """Save the queue state""" try: diff --git a/deluge/ui/gtkui/torrentview.py b/deluge/ui/gtkui/torrentview.py index fe74236b9..175e3cccd 100644 --- a/deluge/ui/gtkui/torrentview.py +++ b/deluge/ui/gtkui/torrentview.py @@ -101,7 +101,6 @@ class TorrentView(listview.ListView): # We need to get the core session state to know which torrents are in # the session so we can add them to our list. session_state = functions.get_session_state(self.core) - print "session_state:", session_state for torrent_id in session_state: self.add_row(torrent_id) @@ -172,7 +171,6 @@ class TorrentView(listview.ListView): """Adds a new torrent row to the treeview""" # Insert a new row to the liststore row = self.liststore.append() - print "columnid:", self.columns["torrent_id"].column_indices[0] # Store the torrent id self.liststore.set_value( row,