diff --git a/downloader.py b/downloader.py index 10d33a9..dda7425 100644 --- a/downloader.py +++ b/downloader.py @@ -33,27 +33,20 @@ if sys.version_info >= (2, 7): loghandler.setFormatter(logging.Formatter('(=====)(levelname)s:%(message)s')) rootlogger.addHandler(loghandler) + try: - import calibre - - del calibre - is_calibre = True -except ImportError: - is_calibre = False - -# using try/except directly was masking errors during development. -if is_calibre: # running under calibre from calibre_plugins.fanfictiondownloader_plugin.fanficdownloader import adapters, writers, exceptions from calibre_plugins.fanfictiondownloader_plugin.fanficdownloader.configurable import Configuration from calibre_plugins.fanfictiondownloader_plugin.fanficdownloader.epubutils import get_dcsource_chaptercount, get_update_data from calibre_plugins.fanfictiondownloader_plugin.fanficdownloader.geturls import get_urls_from_page -else: +except ImportError: from fanficdownloader import adapters, writers, exceptions from fanficdownloader.configurable import Configuration from fanficdownloader.epubutils import get_dcsource_chaptercount, get_update_data from fanficdownloader.geturls import get_urls_from_page + if sys.version_info < (2, 5): print 'This program requires Python 2.5 or newer.' sys.exit(1)