summaryrefslogtreecommitdiffstats
path: root/deluge
diff options
context:
space:
mode:
authorPedro Algarvio <ufs@ufsoft.org>2010-12-28 01:26:25 +0000
committerPedro Algarvio <ufs@ufsoft.org>2010-12-28 01:26:25 +0000
commit5841521133f8bc1b761d6330c41312f8e83cb79d (patch)
tree2ad2b7a32eb3f0772faa88040ed52d54929a7c54 /deluge
parent2fa8ca67534525ca8fe9c06c380e205647711e0c (diff)
downloaddeluge-5841521133f8bc1b761d6330c41312f8e83cb79d.tar.gz
deluge-5841521133f8bc1b761d6330c41312f8e83cb79d.tar.bz2
deluge-5841521133f8bc1b761d6330c41312f8e83cb79d.zip
Added missing import.
Removed log message that caused error. It was never logged anyway, even on the master branch before the improved logging branch was created.
Diffstat (limited to 'deluge')
-rw-r--r--deluge/configmanager.py1
-rw-r--r--deluge/log.py3
2 files changed, 2 insertions, 2 deletions
diff --git a/deluge/configmanager.py b/deluge/configmanager.py
index 8494e2547..dc92a534a 100644
--- a/deluge/configmanager.py
+++ b/deluge/configmanager.py
@@ -55,7 +55,6 @@ class _ConfigManager:
return self.__config_directory
def __del__(self):
- log.debug("ConfigManager stopping..")
del self.config_files
def set_config_dir(self, directory):
diff --git a/deluge/log.py b/deluge/log.py
index 86acf2a40..b014fa9c7 100644
--- a/deluge/log.py
+++ b/deluge/log.py
@@ -37,8 +37,8 @@
"""Logging functions"""
import os
-import logging
import inspect
+import logging
from deluge import common
from twisted.internet import defer
from twisted.python.log import PythonLoggingObserver
@@ -155,6 +155,7 @@ def setupLogger(level="error", filename=None, filemode="w"):
delay=0
)
elif filename and filemode=='w':
+ import logging.handlers
handler = getattr(
logging.handlers, 'WatchedFileHandler', logging.FileHandler)(
filename, filemode, 'utf-8', delay=0