diff --git a/SABHelper.py b/SABHelper.py index 8a0df04..4bdcf42 100644 --- a/SABHelper.py +++ b/SABHelper.py @@ -33,7 +33,7 @@ except ImportError: print "Sorry, requires Python module PyWin32." sys.exit(1) -from sabnzbd.utils.mailslot import MailSlot +from util.mailslot import MailSlot #------------------------------------------------------------------------------ diff --git a/SABnzbd.py b/SABnzbd.py index 0e51f93..4f69224 100755 --- a/SABnzbd.py +++ b/SABnzbd.py @@ -97,7 +97,7 @@ try: import win32api import win32serviceutil, win32evtlogutil, win32event, win32service, pywintypes win32api.SetConsoleCtrlHandler(sabnzbd.sig_handler, True) - from sabnzbd.utils.mailslot import MailSlot + from util.mailslot import MailSlot except ImportError: class MailSlot: pass diff --git a/package.py b/package.py index 1a5bf48..2f67a7f 100644 --- a/package.py +++ b/package.py @@ -478,8 +478,9 @@ elif target in ('binary', 'installer'): options['scripts'] = ['SABHelper.py'] options['zipfile'] = 'lib/sabhelper.zip' options['service'] = [{'modules':["SABHelper"], 'cmdline_style':'custom'}] - options['packages'] = ['sabnzbd.utils'] + options['packages'] = ['util'] options['data_files'] = [] + del options['options']['py2exe']['packages'] setup(**options) rename_file('dist', Win32HelperName, Win32ServiceHelpName) diff --git a/util/__init__.py b/util/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/sabnzbd/utils/mailslot.py b/util/mailslot.py similarity index 100% rename from sabnzbd/utils/mailslot.py rename to util/mailslot.py