From f0f45ea287064874ce448ac6ae7e24f412c3c48f Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Mon, 7 May 2012 11:36:55 +0100 Subject: [PATCH] Move twitter importing to the actual class, avoid not having python-twitter installed bombing running Flexget even if you don't use it. --- output_twitter.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/output_twitter.py b/output_twitter.py index 461dfae..9ce6ecb 100644 --- a/output_twitter.py +++ b/output_twitter.py @@ -43,8 +43,15 @@ class OutputTwitter: config.setdefault('active', False) return config + def on_process_start(self, feed, config): + try: + import twitter + except ImportError: + raise PluginError('Unable to import module twitter, python-twitter is required to use output_twitter') + def on_feed_exit(self, feed): """Send email at exit.""" + import twitter config = self.get_config(feed) if not config['active']: @@ -78,10 +85,5 @@ class OutputTwitter: log.debug("Sending Twitter: %s", content) api.PostUpdate(content) -try: - import twitter -except ImportError: - raise PluginError('Unable to import module twitter, python-twitter is required to use output_twitter') -else: - log.debug("Registering plugin: twitter") - register_plugin(OutputTwitter, 'twitter') +log.debug("Registering plugin: twitter") +register_plugin(OutputTwitter, 'twitter')