From 9632a1eb24946f8c6b2a74cd2aa2555f6037b51e Mon Sep 17 00:00:00 2001 From: ShyPike Date: Mon, 5 Apr 2010 14:47:30 +0200 Subject: [PATCH] Do not refer tp sabnzbd package from SABHelper. --- SABHelper.py | 5 ++--- package.py | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/SABHelper.py b/SABHelper.py index 4bdcf42..d878fa9 100644 --- a/SABHelper.py +++ b/SABHelper.py @@ -29,9 +29,8 @@ try: import win32api, win32file import win32serviceutil, win32evtlogutil, win32event, win32service, pywintypes except ImportError: - if sabnzbd.WIN32: - print "Sorry, requires Python module PyWin32." - sys.exit(1) + print "Sorry, requires Python module PyWin32." + sys.exit(1) from util.mailslot import MailSlot diff --git a/package.py b/package.py index 2f67a7f..7236650 100644 --- a/package.py +++ b/package.py @@ -427,7 +427,7 @@ elif target in ('binary', 'installer'): options['options'] = {"py2exe": { "bundle_files": 3, - "packages": "email,xml,Cheetah", + "packages": "email,xml,Cheetah,win32file", "excludes": ["pywin", "pywin.debugger", "pywin.debugger.dbgcon", "pywin.dialogs", "pywin.dialogs.list", "Tkconstants", "Tkinter", "tcl"], "optimize": 2, @@ -480,7 +480,7 @@ elif target in ('binary', 'installer'): options['service'] = [{'modules':["SABHelper"], 'cmdline_style':'custom'}] options['packages'] = ['util'] options['data_files'] = [] - del options['options']['py2exe']['packages'] + options['options']['py2exe']['packages'] = "win32file" setup(**options) rename_file('dist', Win32HelperName, Win32ServiceHelpName)