diff --git a/downloader.py b/downloader.py index dda7425..62a92de 100644 --- a/downloader.py +++ b/downloader.py @@ -26,6 +26,10 @@ import string import sys +if sys.version_info < (2, 5): + print 'This program requires Python 2.5 or newer.' + sys.exit(1) + if sys.version_info >= (2, 7): # suppresses default logger. Logging is setup in fanficdownload/__init__.py so it works in calibre, too. rootlogger = logging.getLogger() @@ -33,7 +37,6 @@ if sys.version_info >= (2, 7): loghandler.setFormatter(logging.Formatter('(=====)(levelname)s:%(message)s')) rootlogger.addHandler(loghandler) - try: # running under calibre from calibre_plugins.fanfictiondownloader_plugin.fanficdownloader import adapters, writers, exceptions @@ -47,11 +50,6 @@ except ImportError: 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) - - def write_story(config, adapter, writeformat, metaonly=False, outstream=None): writer = writers.getWriter(writeformat, config, adapter) writer.writeStory(outstream=outstream, metaonly=metaonly)