40 lines
956 B
Diff
40 lines
956 B
Diff
--- sabnzbd/config.py
|
|
+++ sabnzbd/config.py
|
|
@@ -24,10 +24,10 @@
|
|
import logging
|
|
import threading
|
|
import shutil
|
|
+import configobj
|
|
import sabnzbd.misc
|
|
from sabnzbd.constants import CONFIG_VERSION, NORMAL_PRIORITY, DEFAULT_PRIORITY, MAX_WIN_DFOLDER
|
|
from sabnzbd.utils import listquote
|
|
-from sabnzbd.utils import configobj
|
|
from sabnzbd.decorators import synchronized
|
|
|
|
CONFIG_LOCK = threading.Lock()
|
|
|
|
--- sabnzbd/rss.py
|
|
+++ sabnzbd/rss.py
|
|
@@ -36,7 +36,7 @@
|
|
import sabnzbd.emailer as emailer
|
|
from sabnzbd.encoding import unicoder, xml_name
|
|
|
|
-import sabnzbd.utils.feedparser as feedparser
|
|
+import feedparser
|
|
|
|
__RSS = None # Global pointer to RSS-scanner instance
|
|
|
|
|
|
--- sabnzbd/growler.py
|
|
+++ sabnzbd/growler.py
|
|
@@ -37,7 +37,7 @@
|
|
from sabnzbd.encoding import unicoder
|
|
from sabnzbd.constants import NOTIFY_KEYS
|
|
|
|
-from gntp import GNTPRegister
|
|
+from gntp.core import GNTPRegister
|
|
from gntp.notifier import GrowlNotifier
|
|
try:
|
|
import Growl
|
|
|