void-packages/srcpkgs/sabnzbd/patches/sabnzbd-00-system-configobj...

47 lines
1.2 KiB
Diff

--- sabnzbd/config.py
+++ sabnzbd/config.py
@@ -23,10 +23,12 @@ import os
import logging
import threading
import shutil
+
+import configobj
+
import sabnzbd.misc
from sabnzbd.constants import CONFIG_VERSION, NORMAL_PRIORITY, DEFAULT_PRIORITY
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
@@ -35,7 +35,7 @@ from sabnzbd.misc import cat_convert, sanitize_foldername, wildcard_to_re, cat_t
import sabnzbd.emailer as emailer
from sabnzbd.encoding import latin1, 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
@@ -31,7 +31,14 @@ import sabnzbd
import sabnzbd.cfg
from sabnzbd.encoding import unicoder, latin1
from sabnzbd.constants import NOTIFY_KEYS
-from gntp import GNTPRegister
+
+try:
+ # <= version 0.6
+ from gntp import GNTPRegister
+except ImportError:
+ # >= version 1.0
+ from gntp.core import GNTPRegister
+
from gntp.notifier import GrowlNotifier
try:
import Growl