BackTrackZ/scrapy
BackTrackZ/scrapy
1
0
Fork 0
mirror of https://github.com/scrapy/scrapy.git synced 2025-02-28 21:17:55 +00:00
Code Releases Wiki Activity

Merge pull request #307 from DeaconDesperado/raise-format

Browse Source 
Raise a usage error when an invalid or unrecognized output format is entered on Command line
This commit is contained in:
Nicolás Alejandro Ramírez Quiros 2013-05-23 12:50:17 -07:00
commit 7874eef7af
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scrapy/commands/crawl.py
View File

@ -32,6 +32,9 @@ class Command(ScrapyCommand):
self.settings.overrides['FEED_URI'] = 'stdout:' self.settings.overrides['FEED_URI'] = 'stdout:'
else: else:
self.settings.overrides['FEED_URI'] = opts.output 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 self.settings.overrides['FEED_FORMAT'] = opts.output_format
def run(self, args, opts): def run(self, args, opts):

3
scrapy/commands/runspider.py
View File

@ -54,6 +54,9 @@ class Command(ScrapyCommand):
self.settings.overrides['FEED_URI'] = 'stdout:' self.settings.overrides['FEED_URI'] = 'stdout:'
else: else:
self.settings.overrides['FEED_URI'] = opts.output 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 self.settings.overrides['FEED_FORMAT'] = opts.output_format
def run(self, args, opts): def run(self, args, opts):