From 485a954571cb659e6fbb3059ac1f4b7954fef145 Mon Sep 17 00:00:00 2001 From: Mark Grey Date: Wed, 22 May 2013 14:21:36 -0400 Subject: [PATCH] raise on unrecognized format --- scrapy/commands/crawl.py | 3 +++ scrapy/commands/runspider.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/scrapy/commands/crawl.py b/scrapy/commands/crawl.py index 1333d366d..e1167cbc0 100644 --- a/scrapy/commands/crawl.py +++ b/scrapy/commands/crawl.py @@ -32,6 +32,9 @@ class Command(ScrapyCommand): self.settings.overrides['FEED_URI'] = 'stdout:' else: self.settings.overrides['FEED_URI'] = opts.output + valid_output_formats = self.settings['FEED_EXPORTERS'].keys() + self.settings['FEED_EXPORTERS_BASE'].keys() + if opts.output_format not in valid_output_formats: + raise UsageError('Invalid/unrecognized output format: %s, Expected %s' % (opts.output_format,valid_output_formats)) self.settings.overrides['FEED_FORMAT'] = opts.output_format def run(self, args, opts): diff --git a/scrapy/commands/runspider.py b/scrapy/commands/runspider.py index cac7d3d98..ff528fdf3 100644 --- a/scrapy/commands/runspider.py +++ b/scrapy/commands/runspider.py @@ -54,6 +54,9 @@ class Command(ScrapyCommand): self.settings.overrides['FEED_URI'] = 'stdout:' else: self.settings.overrides['FEED_URI'] = opts.output + valid_output_formats = self.settings['FEED_EXPORTERS'].keys() + self.settings['FEED_EXPORTERS_BASE'].keys() + if opts.output_format not in valid_output_formats: + raise UsageError('Invalid/unrecognized output format: %s, Expected %s' % (opts.output_format,valid_output_formats)) self.settings.overrides['FEED_FORMAT'] = opts.output_format def run(self, args, opts):