diff --git a/deluge/log.py b/deluge/log.py index 04dfd75f0..c2a40da6f 100644 --- a/deluge/log.py +++ b/deluge/log.py @@ -232,6 +232,8 @@ def setLoggerLevel(level, logger_name=None): def getPluginLogger(logger_name): + if 'deluge.plugins.' in logger_name: + return logging.getLogger(logger_name) return logging.getLogger("deluge.plugin.%s" % logger_name) diff --git a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py index e0b3f5b53..a8405b422 100644 --- a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py +++ b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/core.py @@ -40,7 +40,7 @@ from deluge._libtorrent import lt import os -from deluge.log import getPluginLogger +import logging from deluge.plugins.pluginbase import CorePluginBase import deluge.component as component import deluge.configmanager @@ -50,7 +50,7 @@ from twisted.internet.task import LoopingCall, deferLater from twisted.internet import reactor from deluge.event import DelugeEvent -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) DEFAULT_PREFS = { "watchdirs":{}, diff --git a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/gtkui.py b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/gtkui.py index e32d37ff6..2285798db 100644 --- a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/gtkui.py +++ b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/gtkui.py @@ -38,8 +38,7 @@ # import gtk - -from deluge.log import getPluginLogger +import logging from deluge.ui.client import client from deluge.ui.gtkui import dialogs from deluge.plugins.pluginbase import GtkPluginBase @@ -49,7 +48,7 @@ import os from common import get_resource -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class IncompatibleOption(Exception): pass diff --git a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/webui.py b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/webui.py index eab62a355..a2d56f549 100644 --- a/deluge/plugins/AutoAdd/deluge/plugins/autoadd/webui.py +++ b/deluge/plugins/AutoAdd/deluge/plugins/autoadd/webui.py @@ -37,14 +37,14 @@ # statement from all source files in the program, then also delete it here. # -from deluge.log import getPluginLogger +import logging from deluge.ui.client import client from deluge import component from deluge.plugins.pluginbase import WebPluginBase from common import get_resource -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class WebUI(WebPluginBase): diff --git a/deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py b/deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py index f6ca3f52c..897333113 100644 --- a/deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py +++ b/deluge/plugins/Blocklist/deluge/plugins/blocklist/core.py @@ -36,6 +36,7 @@ import os import time +import logging from datetime import datetime, timedelta from wsgiref.handlers import format_date_time from urlparse import urljoin @@ -45,7 +46,7 @@ from twisted.internet.task import LoopingCall from twisted.internet import threads, defer from twisted.web import error -from deluge.log import getPluginLogger + from deluge.plugins.pluginbase import CorePluginBase import deluge.component as component import deluge.configmanager @@ -58,7 +59,7 @@ from readers import ReaderParseError # TODO: check return values for deferred callbacks # TODO: review class attributes for redundancy -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) DEFAULT_PREFS = { "url": "http://deluge-torrent.org/blocklist/nipfilter.dat.gz", diff --git a/deluge/plugins/Blocklist/deluge/plugins/blocklist/gtkui.py b/deluge/plugins/Blocklist/deluge/plugins/blocklist/gtkui.py index 98c858dae..1f9d505f2 100644 --- a/deluge/plugins/Blocklist/deluge/plugins/blocklist/gtkui.py +++ b/deluge/plugins/Blocklist/deluge/plugins/blocklist/gtkui.py @@ -33,17 +33,17 @@ # # +import logging from datetime import datetime import gtk -from deluge.log import getPluginLogger from deluge.ui.client import client import deluge.component as component import deluge.common from deluge.plugins.pluginbase import GtkPluginBase import common -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class GtkUI(GtkPluginBase): def enable(self): diff --git a/deluge/plugins/Blocklist/deluge/plugins/blocklist/peerguardian.py b/deluge/plugins/Blocklist/deluge/plugins/blocklist/peerguardian.py index 2d8a0256d..222595e8a 100644 --- a/deluge/plugins/Blocklist/deluge/plugins/blocklist/peerguardian.py +++ b/deluge/plugins/Blocklist/deluge/plugins/blocklist/peerguardian.py @@ -3,13 +3,12 @@ # Distributed under the same terms as Deluge ## +import logging from exceptions import Exception from struct import unpack import gzip, socket -from deluge.log import getPluginLogger - -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class PGException(Exception): pass diff --git a/deluge/plugins/Blocklist/deluge/plugins/blocklist/webui.py b/deluge/plugins/Blocklist/deluge/plugins/blocklist/webui.py index 2c4e0de4a..e836fc704 100644 --- a/deluge/plugins/Blocklist/deluge/plugins/blocklist/webui.py +++ b/deluge/plugins/Blocklist/deluge/plugins/blocklist/webui.py @@ -36,12 +36,12 @@ import os -from deluge.log import getPluginLogger +import logging from deluge.ui.client import client from deluge import component from deluge.plugins.pluginbase import WebPluginBase -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) #import deluge.ui.webui.lib.newforms_plus as forms diff --git a/deluge/plugins/Example/deluge/plugins/example/core.py b/deluge/plugins/Example/deluge/plugins/example/core.py index 319580c91..98ae7eca7 100644 --- a/deluge/plugins/Example/deluge/plugins/example/core.py +++ b/deluge/plugins/Example/deluge/plugins/example/core.py @@ -33,13 +33,13 @@ # # -from deluge.log import getPluginLogger +import logging from deluge.plugins.pluginbase import CorePluginBase import deluge.component as component import deluge.configmanager from deluge.core.rpcserver import export -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class Core(CorePluginBase): def enable(self): diff --git a/deluge/plugins/Example/deluge/plugins/example/gtkui.py b/deluge/plugins/Example/deluge/plugins/example/gtkui.py index 9227cd511..6dde31eaa 100644 --- a/deluge/plugins/Example/deluge/plugins/example/gtkui.py +++ b/deluge/plugins/Example/deluge/plugins/example/gtkui.py @@ -34,14 +34,14 @@ # import gtk +import logging -from deluge.log import getPluginLogger from deluge.ui.client import client from deluge.plugins.pluginbase import GtkPluginBase import deluge.component as component import deluge.common -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class GtkUI(GtkPluginBase): def enable(self): diff --git a/deluge/plugins/Example/deluge/plugins/example/webui.py b/deluge/plugins/Example/deluge/plugins/example/webui.py index 961cb49e7..eb66b3b2e 100644 --- a/deluge/plugins/Example/deluge/plugins/example/webui.py +++ b/deluge/plugins/Example/deluge/plugins/example/webui.py @@ -33,14 +33,14 @@ # # -from deluge.log import getPluginLogger +import logging from deluge.ui.client import client from deluge import component from deluge.plugins.pluginbase import WebPluginBase from common import get_resource -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class WebUI(WebPluginBase): diff --git a/deluge/plugins/Execute/deluge/plugins/execute/core.py b/deluge/plugins/Execute/deluge/plugins/execute/core.py index 54362b1c7..23237da28 100644 --- a/deluge/plugins/Execute/deluge/plugins/execute/core.py +++ b/deluge/plugins/Execute/deluge/plugins/execute/core.py @@ -36,16 +36,16 @@ import os import time import hashlib +import logging from subprocess import Popen, PIPE -from deluge.log import getPluginLogger from deluge.plugins.pluginbase import CorePluginBase import deluge.component as component from deluge.configmanager import ConfigManager from deluge.core.rpcserver import export from deluge.event import DelugeEvent -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) DEFAULT_CONFIG = { "commands": [] diff --git a/deluge/plugins/Execute/deluge/plugins/execute/gtkui.py b/deluge/plugins/Execute/deluge/plugins/execute/gtkui.py index 3cd148a55..cab4e08ad 100644 --- a/deluge/plugins/Execute/deluge/plugins/execute/gtkui.py +++ b/deluge/plugins/Execute/deluge/plugins/execute/gtkui.py @@ -35,15 +35,15 @@ import os import gtk +import logging import pkg_resources -from deluge.log import getPluginLogger from deluge.ui.client import client from deluge.plugins.pluginbase import GtkPluginBase import deluge.component as component import deluge.common -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) EXECUTE_ID = 0 EXECUTE_EVENT = 1 diff --git a/deluge/plugins/Execute/deluge/plugins/execute/webui.py b/deluge/plugins/Execute/deluge/plugins/execute/webui.py index cf529119a..d0776901d 100644 --- a/deluge/plugins/Execute/deluge/plugins/execute/webui.py +++ b/deluge/plugins/Execute/deluge/plugins/execute/webui.py @@ -34,14 +34,14 @@ # -from deluge.log import getPluginLogger +import logging from deluge.ui.client import client from deluge import component from deluge.plugins.pluginbase import WebPluginBase from common import get_resource -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class WebUI(WebPluginBase): diff --git a/deluge/plugins/Extractor/deluge/plugins/extractor/core.py b/deluge/plugins/Extractor/deluge/plugins/extractor/core.py index 03eeda1e7..5af4212f1 100644 --- a/deluge/plugins/Extractor/deluge/plugins/extractor/core.py +++ b/deluge/plugins/Extractor/deluge/plugins/extractor/core.py @@ -38,16 +38,16 @@ # import os +import logging from twisted.internet.utils import getProcessValue -from deluge.log import getPluginLogger from deluge.plugins.pluginbase import CorePluginBase import deluge.component as component import deluge.configmanager from deluge.core.rpcserver import export -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) DEFAULT_PREFS = { "extract_path": "", @@ -100,22 +100,22 @@ class Core(CorePluginBase): # Now that we have the cmd, lets run it to extract the files fp = os.path.join(save_path, f["path"]) - + # Get the destination path dest = self.config["extract_path"] if self.config["use_name_folder"]: name = component.get("TorrentManager")[torrent_id].get_status(["name"])["name"] dest = os.path.join(dest, name) - # Create the destination folder if it doesn't exist + # Create the destination folder if it doesn't exist if not os.path.exists(dest): try: os.makedirs(dest) except Exception, e: log.error("Error creating destination folder: %s", e) return - - log.debug("Extracting to %s", dest) + + log.debug("Extracting to %s", dest) def on_extract_success(result, torrent_id): # XXX: Emit an event log.debug("Extract was successful for %s", torrent_id) diff --git a/deluge/plugins/Extractor/deluge/plugins/extractor/gtkui.py b/deluge/plugins/Extractor/deluge/plugins/extractor/gtkui.py index d27e253ed..7f1983617 100644 --- a/deluge/plugins/Extractor/deluge/plugins/extractor/gtkui.py +++ b/deluge/plugins/Extractor/deluge/plugins/extractor/gtkui.py @@ -38,8 +38,8 @@ # import gtk +import logging -from deluge.log import getPluginLogger from deluge.ui.client import client from deluge.plugins.pluginbase import GtkPluginBase import deluge.component as component @@ -47,7 +47,7 @@ import deluge.common from common import get_resource -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class GtkUI(GtkPluginBase): def enable(self): diff --git a/deluge/plugins/Extractor/deluge/plugins/extractor/webui.py b/deluge/plugins/Extractor/deluge/plugins/extractor/webui.py index 5f198981d..025ac728e 100644 --- a/deluge/plugins/Extractor/deluge/plugins/extractor/webui.py +++ b/deluge/plugins/Extractor/deluge/plugins/extractor/webui.py @@ -37,12 +37,12 @@ # # -from deluge.log import getPluginLogger +import logging from deluge.ui.client import client from deluge import component from deluge.plugins.pluginbase import WebPluginBase -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class WebUI(WebPluginBase): def enable(self): diff --git a/deluge/plugins/Feeder/deluge/plugins/feeder/core.py b/deluge/plugins/Feeder/deluge/plugins/feeder/core.py index ad74c1c23..18debb46d 100644 --- a/deluge/plugins/Feeder/deluge/plugins/feeder/core.py +++ b/deluge/plugins/Feeder/deluge/plugins/feeder/core.py @@ -37,18 +37,18 @@ # statement from all source files in the program, then also delete it here. # +import logging import feedparser # for parsing rss feeds import threading # for threaded updates import re # for regular expressions from twisted.internet.task import LoopingCall -from deluge.log import getPluginLogger from deluge.plugins.pluginbase import CorePluginBase import deluge.component as component import deluge.configmanager from deluge.core.rpcserver import export -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) DEFAULT_PREFS = { "feeds": {}, diff --git a/deluge/plugins/Feeder/deluge/plugins/feeder/webui.py b/deluge/plugins/Feeder/deluge/plugins/feeder/webui.py index 662e13c5d..5cf5440c1 100644 --- a/deluge/plugins/Feeder/deluge/plugins/feeder/webui.py +++ b/deluge/plugins/Feeder/deluge/plugins/feeder/webui.py @@ -34,14 +34,14 @@ # but you are not obligated to do so. If you do not wish to do so, delete # this exception statement from your version. If you delete this exception +import logging import feedparser # for proccessing feed entries import os -from deluge.log import getPluginLogger from deluge.ui.client import sclient, aclient from deluge.plugins.webuipluginbase import WebUIPluginBase from deluge import component -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) api = component.get("WebPluginApi") forms = api.forms diff --git a/deluge/plugins/FreeSpace/deluge/plugins/freespace/core.py b/deluge/plugins/FreeSpace/deluge/plugins/freespace/core.py index eb90ecb68..3fca2c18e 100644 --- a/deluge/plugins/FreeSpace/deluge/plugins/freespace/core.py +++ b/deluge/plugins/FreeSpace/deluge/plugins/freespace/core.py @@ -37,18 +37,17 @@ # statement from all source files in the program, then also delete it here. # - +import logging import os, statvfs from datetime import datetime, timedelta from twisted.internet import task -from deluge.log import getPluginLogger from deluge.plugins.pluginbase import CorePluginBase from deluge.event import DelugeEvent import deluge.component as component import deluge.configmanager from deluge.core.rpcserver import export -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class LowDiskSpaceEvent(DelugeEvent): diff --git a/deluge/plugins/FreeSpace/deluge/plugins/freespace/gtkui.py b/deluge/plugins/FreeSpace/deluge/plugins/freespace/gtkui.py index 21405ccda..93e155508 100644 --- a/deluge/plugins/FreeSpace/deluge/plugins/freespace/gtkui.py +++ b/deluge/plugins/FreeSpace/deluge/plugins/freespace/gtkui.py @@ -38,8 +38,8 @@ # import gtk +import logging -from deluge.log import getPluginLogger from deluge.ui.client import client from deluge.plugins.pluginbase import GtkPluginBase import deluge.component as component @@ -47,7 +47,7 @@ import deluge.common from common import get_resource -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class GtkUI(GtkPluginBase): diff --git a/deluge/plugins/FreeSpace/deluge/plugins/freespace/webui.py b/deluge/plugins/FreeSpace/deluge/plugins/freespace/webui.py index a2686597b..5060acac5 100644 --- a/deluge/plugins/FreeSpace/deluge/plugins/freespace/webui.py +++ b/deluge/plugins/FreeSpace/deluge/plugins/freespace/webui.py @@ -37,14 +37,14 @@ # statement from all source files in the program, then also delete it here. # -from deluge.log import getPluginLogger +import logging from deluge.ui.client import client from deluge import component from deluge.plugins.pluginbase import WebPluginBase from common import get_resource -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class WebUI(WebPluginBase): diff --git a/deluge/plugins/Label/deluge/plugins/label/core.py b/deluge/plugins/Label/deluge/plugins/label/core.py index 5c76f5d19..1c950235b 100644 --- a/deluge/plugins/Label/deluge/plugins/label/core.py +++ b/deluge/plugins/Label/deluge/plugins/label/core.py @@ -37,7 +37,7 @@ torrent-label core plugin. adds a status field for tracker. """ -from deluge.log import getPluginLogger +import logging from deluge.plugins.pluginbase import CorePluginBase from deluge.core.rpcserver import export from deluge.configmanager import ConfigManager @@ -47,7 +47,7 @@ from urlparse import urlparse import traceback import re -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) RE_VALID = re.compile("[a-z0-9_\-\.]*\Z") diff --git a/deluge/plugins/Label/deluge/plugins/label/gtkui/__init__.py b/deluge/plugins/Label/deluge/plugins/label/gtkui/__init__.py index 81dbe8e52..8ee0d3c59 100644 --- a/deluge/plugins/Label/deluge/plugins/label/gtkui/__init__.py +++ b/deluge/plugins/Label/deluge/plugins/label/gtkui/__init__.py @@ -35,8 +35,8 @@ import os +import logging import pkg_resources # access plugin egg -from deluge.log import getPluginLogger from deluge import component # for systray from deluge.plugins.pluginbase import GtkPluginBase import gtk, gobject @@ -46,7 +46,7 @@ import sidebar_menu import label_config import submenu -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) NO_LABEL = "No Label" diff --git a/deluge/plugins/Label/deluge/plugins/label/gtkui/label_config.py b/deluge/plugins/Label/deluge/plugins/label/gtkui/label_config.py index 1288f7165..473ae5231 100644 --- a/deluge/plugins/Label/deluge/plugins/label/gtkui/label_config.py +++ b/deluge/plugins/Label/deluge/plugins/label/gtkui/label_config.py @@ -36,13 +36,13 @@ import gtk import gtk.glade import os +import logging import pkg_resources # access plugin egg import deluge.component as component import deluge.common -from deluge.log import getPluginLogger from deluge.ui.client import client -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class LabelConfig(object): diff --git a/deluge/plugins/Label/deluge/plugins/label/gtkui/sidebar_menu.py b/deluge/plugins/Label/deluge/plugins/label/gtkui/sidebar_menu.py index 0bcfb0835..5070b647c 100644 --- a/deluge/plugins/Label/deluge/plugins/label/gtkui/sidebar_menu.py +++ b/deluge/plugins/Label/deluge/plugins/label/gtkui/sidebar_menu.py @@ -37,13 +37,13 @@ import gtk import gtk.glade +import logging import deluge.component as component import deluge.common -from deluge.log import getPluginLogger from deluge.ui.client import client -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) NO_LABEL = "No Label" diff --git a/deluge/plugins/Label/deluge/plugins/label/gtkui/submenu.py b/deluge/plugins/Label/deluge/plugins/label/gtkui/submenu.py index a2e12ea57..60eefd5bc 100644 --- a/deluge/plugins/Label/deluge/plugins/label/gtkui/submenu.py +++ b/deluge/plugins/Label/deluge/plugins/label/gtkui/submenu.py @@ -35,13 +35,13 @@ import os +import logging import pkg_resources # access plugin egg -from deluge.log import getPluginLogger from deluge import component # for systray import gtk, gobject from deluge.ui.client import client -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) NO_LABEL = "No Label" diff --git a/deluge/plugins/Label/deluge/plugins/label/webui.py b/deluge/plugins/Label/deluge/plugins/label/webui.py index 1cf7f4c0c..2e16e8d90 100644 --- a/deluge/plugins/Label/deluge/plugins/label/webui.py +++ b/deluge/plugins/Label/deluge/plugins/label/webui.py @@ -38,14 +38,14 @@ # import os +import logging import pkg_resources from deluge.common import fspeed -from deluge.log import getPluginLogger from deluge.ui.client import client from deluge.plugins.pluginbase import WebPluginBase from deluge import component -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) def get_resource(filename): return pkg_resources.resource_filename("deluge.plugins.label", diff --git a/deluge/plugins/Notifications/deluge/plugins/notifications/common.py b/deluge/plugins/Notifications/deluge/plugins/notifications/common.py index 1c6cb52b0..8bc72b961 100644 --- a/deluge/plugins/Notifications/deluge/plugins/notifications/common.py +++ b/deluge/plugins/Notifications/deluge/plugins/notifications/common.py @@ -37,11 +37,11 @@ # statement from all source files in the program, then also delete it here. # +import logging from twisted.internet import defer from deluge import component -from deluge.log import getPluginLogger -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) try: from deluge.event import known_events diff --git a/deluge/plugins/Notifications/deluge/plugins/notifications/core.py b/deluge/plugins/Notifications/deluge/plugins/notifications/core.py index 5b01ca8b4..7df3a2ab3 100644 --- a/deluge/plugins/Notifications/deluge/plugins/notifications/core.py +++ b/deluge/plugins/Notifications/deluge/plugins/notifications/core.py @@ -38,18 +38,18 @@ # import smtplib +import logging from email.utils import formatdate from twisted.internet import defer, threads from deluge import component from deluge.event import known_events -from deluge.log import getPluginLogger from deluge.plugins.pluginbase import CorePluginBase import deluge.configmanager from deluge.core.rpcserver import export from common import CustomNotifications -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) DEFAULT_PREFS = { "smtp_enabled": False, diff --git a/deluge/plugins/Notifications/deluge/plugins/notifications/gtkui.py b/deluge/plugins/Notifications/deluge/plugins/notifications/gtkui.py index 79b272ac8..cc1aa47e2 100644 --- a/deluge/plugins/Notifications/deluge/plugins/notifications/gtkui.py +++ b/deluge/plugins/Notifications/deluge/plugins/notifications/gtkui.py @@ -37,11 +37,11 @@ # statement from all source files in the program, then also delete it here. # +import logging from os.path import basename import gtk from twisted.internet import defer -from deluge.log import getPluginLogger from deluge.ui.client import client from deluge.plugins.pluginbase import GtkPluginBase import deluge.component as component @@ -51,7 +51,7 @@ import deluge.configmanager # Relative imports from common import get_resource, CustomNotifications -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) try: import pygame diff --git a/deluge/plugins/Notifications/deluge/plugins/notifications/test.py b/deluge/plugins/Notifications/deluge/plugins/notifications/test.py index 648d4ad0c..bb6847c6c 100644 --- a/deluge/plugins/Notifications/deluge/plugins/notifications/test.py +++ b/deluge/plugins/Notifications/deluge/plugins/notifications/test.py @@ -6,12 +6,12 @@ # License: BSD - Please view the LICENSE file for additional information. # ============================================================================== +import logging from twisted.internet import task from deluge import component from deluge.event import DelugeEvent -from deluge.log import getPluginLogger -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class FooEvent(DelugeEvent): """foo Event""" diff --git a/deluge/plugins/Notifications/deluge/plugins/notifications/webui.py b/deluge/plugins/Notifications/deluge/plugins/notifications/webui.py index 9ab62bdf9..3a39b9469 100644 --- a/deluge/plugins/Notifications/deluge/plugins/notifications/webui.py +++ b/deluge/plugins/Notifications/deluge/plugins/notifications/webui.py @@ -37,8 +37,8 @@ # statement from all source files in the program, then also delete it here. # +import logging from twisted.internet import defer -from deluge.log import getPluginLogger from deluge.ui.client import client from deluge import component from deluge.plugins.pluginbase import WebPluginBase @@ -47,7 +47,7 @@ import deluge.configmanager # Relative imports from common import get_resource -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) DEFAULT_PREFS = { # FLASH diff --git a/deluge/plugins/Scheduler/deluge/plugins/scheduler/core.py b/deluge/plugins/Scheduler/deluge/plugins/scheduler/core.py index c4b13d492..9554baadf 100644 --- a/deluge/plugins/Scheduler/deluge/plugins/scheduler/core.py +++ b/deluge/plugins/Scheduler/deluge/plugins/scheduler/core.py @@ -37,8 +37,7 @@ # import time - -from deluge.log import getPluginLogger +import logging from deluge.plugins.pluginbase import CorePluginBase import deluge.component as component import deluge.configmanager @@ -47,7 +46,7 @@ from deluge.event import DelugeEvent from twisted.internet import reactor -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) DEFAULT_PREFS = { "low_down": -1.0, diff --git a/deluge/plugins/Scheduler/deluge/plugins/scheduler/gtkui.py b/deluge/plugins/Scheduler/deluge/plugins/scheduler/gtkui.py index 739f29ab5..580eba2d8 100644 --- a/deluge/plugins/Scheduler/deluge/plugins/scheduler/gtkui.py +++ b/deluge/plugins/Scheduler/deluge/plugins/scheduler/gtkui.py @@ -37,8 +37,7 @@ # import gtk - -from deluge.log import getPluginLogger +import logging from deluge.ui.client import client from deluge.plugins.pluginbase import GtkPluginBase import deluge.component as component @@ -46,7 +45,7 @@ import deluge.common from common import get_resource -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) DAYS = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"] diff --git a/deluge/plugins/Scheduler/deluge/plugins/scheduler/webui.py b/deluge/plugins/Scheduler/deluge/plugins/scheduler/webui.py index fd06cfe8e..85aea5537 100644 --- a/deluge/plugins/Scheduler/deluge/plugins/scheduler/webui.py +++ b/deluge/plugins/Scheduler/deluge/plugins/scheduler/webui.py @@ -36,14 +36,14 @@ # statement from all source files in the program, then also delete it here. # -from deluge.log import getPluginLogger +import logging from deluge.ui.client import client from deluge import component from deluge.plugins.pluginbase import WebPluginBase from common import get_resource -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class WebUI(WebPluginBase): diff --git a/deluge/plugins/Stats/deluge/plugins/stats/core.py b/deluge/plugins/Stats/deluge/plugins/stats/core.py index b16aa7c8f..8499d7de0 100644 --- a/deluge/plugins/Stats/deluge/plugins/stats/core.py +++ b/deluge/plugins/Stats/deluge/plugins/stats/core.py @@ -44,17 +44,17 @@ # but you are not obligated to do so. If you do not wish to do so, delete # this exception statement from your version. If you delete this exception +import logging from twisted.internet.task import LoopingCall import time import deluge -from deluge.log import getPluginLogger from deluge.plugins.pluginbase import CorePluginBase from deluge import component from deluge import configmanager from deluge.core.rpcserver import export -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) DEFAULT_PREFS = { "test": "NiNiNi", diff --git a/deluge/plugins/Stats/deluge/plugins/stats/graph.py b/deluge/plugins/Stats/deluge/plugins/stats/graph.py index 8432bc2e9..7f6a0548e 100644 --- a/deluge/plugins/Stats/deluge/plugins/stats/graph.py +++ b/deluge/plugins/Stats/deluge/plugins/stats/graph.py @@ -48,7 +48,7 @@ port of old plugin by markybob. """ import time import cairo -from deluge.log import getPluginLogger +import logging from deluge.ui.client import client black = (0, 0, 0) @@ -60,13 +60,13 @@ green = (0, 1.0, 0) blue = (0, 0, 1.0) orange = (1.0, 0.74, 0) -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) def default_formatter(value): return str(value) def change_opacity(color, opactiy): - """A method to assist in changing the opactiy of a color inorder to draw the + """A method to assist in changing the opacity of a color in order to draw the fills. """ color = list(color) diff --git a/deluge/plugins/Stats/deluge/plugins/stats/gtkui.py b/deluge/plugins/Stats/deluge/plugins/stats/gtkui.py index b2ed73730..499084f99 100644 --- a/deluge/plugins/Stats/deluge/plugins/stats/gtkui.py +++ b/deluge/plugins/Stats/deluge/plugins/stats/gtkui.py @@ -47,19 +47,19 @@ import gtk import gobject +import logging from gtk.glade import XML from twisted.internet import defer import graph from deluge import component -from deluge.log import getPluginLogger from deluge.common import fspeed from deluge.ui.client import client from deluge.ui.gtkui.torrentdetails import Tab from deluge.plugins.pluginbase import GtkPluginBase -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class GraphsTab(Tab): def __init__(self, glade): diff --git a/deluge/plugins/Stats/deluge/plugins/stats/webui.py b/deluge/plugins/Stats/deluge/plugins/stats/webui.py index d78ff86c9..e48d4d654 100644 --- a/deluge/plugins/Stats/deluge/plugins/stats/webui.py +++ b/deluge/plugins/Stats/deluge/plugins/stats/webui.py @@ -33,20 +33,20 @@ # # -from deluge.log import getPluginLogger +import logging from deluge.ui.client import client from deluge import component from deluge.plugins.pluginbase import WebPluginBase from common import get_resource -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class WebUI(WebPluginBase): scripts = [get_resource("stats.js")] - # The enable and disable methods are not scrictly required on the WebUI + # The enable and disable methods are not strictly required on the WebUI # plugins. They are only here if you need to register images/stylesheets # with the webserver. def enable(self): diff --git a/deluge/plugins/Toggle/deluge/plugins/toggle/core.py b/deluge/plugins/Toggle/deluge/plugins/toggle/core.py index 1e229c180..8281a7cb3 100644 --- a/deluge/plugins/Toggle/deluge/plugins/toggle/core.py +++ b/deluge/plugins/Toggle/deluge/plugins/toggle/core.py @@ -37,13 +37,13 @@ # statement from all source files in the program, then also delete it here. # -from deluge.log import getPluginLogger +import logging from deluge.plugins.pluginbase import CorePluginBase import deluge.component as component import deluge.configmanager from deluge.core.rpcserver import export -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) DEFAULT_PREFS = { } diff --git a/deluge/plugins/Toggle/deluge/plugins/toggle/gtkui.py b/deluge/plugins/Toggle/deluge/plugins/toggle/gtkui.py index eb2941269..388e547c9 100644 --- a/deluge/plugins/Toggle/deluge/plugins/toggle/gtkui.py +++ b/deluge/plugins/Toggle/deluge/plugins/toggle/gtkui.py @@ -38,8 +38,8 @@ # import gtk +import logging -from deluge.log import getPluginLogger from deluge.ui.client import client from deluge.plugins.pluginbase import GtkPluginBase import deluge.component as component @@ -47,7 +47,7 @@ import deluge.common from common import get_resource -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class GtkUI(GtkPluginBase): def enable(self): diff --git a/deluge/plugins/Toggle/deluge/plugins/toggle/webui.py b/deluge/plugins/Toggle/deluge/plugins/toggle/webui.py index 023085a05..7605bc868 100644 --- a/deluge/plugins/Toggle/deluge/plugins/toggle/webui.py +++ b/deluge/plugins/Toggle/deluge/plugins/toggle/webui.py @@ -37,14 +37,14 @@ # statement from all source files in the program, then also delete it here. # -from deluge.log import getPluginLogger +import logging from deluge.ui.client import client from deluge import component from deluge.plugins.pluginbase import WebPluginBase from common import get_resource -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class WebUI(WebPluginBase): diff --git a/deluge/plugins/WebUi/deluge/plugins/webui/core.py b/deluge/plugins/WebUi/deluge/plugins/webui/core.py index 3f5fb8686..a009f0c5c 100644 --- a/deluge/plugins/WebUi/deluge/plugins/webui/core.py +++ b/deluge/plugins/WebUi/deluge/plugins/webui/core.py @@ -37,13 +37,13 @@ # import os +import logging from deluge import common, component, configmanager -from deluge.log import getPluginLogger from deluge.plugins.pluginbase import CorePluginBase from deluge.core.rpcserver import export -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) DEFAULT_PREFS = { "enabled": False, diff --git a/deluge/plugins/WebUi/deluge/plugins/webui/gtkui.py b/deluge/plugins/WebUi/deluge/plugins/webui/gtkui.py index 47b02e9ab..c5c7586c7 100644 --- a/deluge/plugins/WebUi/deluge/plugins/webui/gtkui.py +++ b/deluge/plugins/WebUi/deluge/plugins/webui/gtkui.py @@ -37,8 +37,8 @@ # import gtk +import logging -from deluge.log import getPluginLogger from deluge.ui.client import client from deluge.plugins.pluginbase import GtkPluginBase import deluge.component as component @@ -46,7 +46,7 @@ import deluge.common from common import get_resource -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class GtkUI(GtkPluginBase): def enable(self): diff --git a/deluge/scripts/create_plugin.py b/deluge/scripts/create_plugin.py index a26b1e6ae..6ec1c0159 100644 --- a/deluge/scripts/create_plugin.py +++ b/deluge/scripts/create_plugin.py @@ -113,6 +113,7 @@ def create_plugin(): CORE = """ +import logging from deluge.plugins.pluginbase import CorePluginBase import deluge.component as component import deluge.configmanager @@ -122,6 +123,8 @@ DEFAULT_PREFS = { "test":"NiNiNi" } +log = logging.getLogger(__name__) + class Core(CorePluginBase): def enable(self): self.config = deluge.configmanager.ConfigManager("%(safe_name)s.conf", DEFAULT_PREFS) @@ -216,8 +219,8 @@ def get_resource(filename): GTKUI = """ import gtk +import logging -from deluge.log import getPluginLogger from deluge.ui.client import client from deluge.plugins.pluginbase import GtkPluginBase import deluge.component as component @@ -225,7 +228,7 @@ import deluge.common from common import get_resource -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class GtkUI(GtkPluginBase): def enable(self): @@ -285,14 +288,14 @@ GLADE = """ """ WEBUI = """ -from deluge.log import getPluginLogger +import logging from deluge.ui.client import client from deluge import component from deluge.plugins.pluginbase import WebPluginBase from common import get_resource -log = getPluginLogger(__name__) +log = logging.getLogger(__name__) class WebUI(WebPluginBase):