|
@ -94,7 +94,7 @@ def _real_main(argv=None): |
|
|
if opts.verbose: |
|
|
if opts.verbose: |
|
|
write_string('[debug] Batch file urls: ' + repr(batch_urls) + '\n') |
|
|
write_string('[debug] Batch file urls: ' + repr(batch_urls) + '\n') |
|
|
except IOError: |
|
|
except IOError: |
|
|
sys.exit('ERROR: batch file could not be read') |
|
|
|
|
|
|
|
|
sys.exit('ERROR: batch file %s could not be read' % opts.batchfile) |
|
|
all_urls = batch_urls + [url.strip() for url in args] # batch_urls are already striped in read_batch_urls |
|
|
all_urls = batch_urls + [url.strip() for url in args] # batch_urls are already striped in read_batch_urls |
|
|
_enc = preferredencoding() |
|
|
_enc = preferredencoding() |
|
|
all_urls = [url.decode(_enc, 'ignore') if isinstance(url, bytes) else url for url in all_urls] |
|
|
all_urls = [url.decode(_enc, 'ignore') if isinstance(url, bytes) else url for url in all_urls] |
|
|