from cgi import parse_qs
std_headers = {
- 'User-Agent': 'Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.7) Gecko/20100720 Firefox/3.6.7',
+ 'User-Agent': 'Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.8) Gecko/20100723 Firefox/3.6.8',
'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.7',
'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
'Accept-Language': 'en-us,en;q=0.5',
(percent_str, data_len_str, speed_str, eta_str), skip_eol=True)
def report_resuming_byte(self, resume_len):
- """Report attemtp to resume at given byte."""
+ """Report attempt to resume at given byte."""
self.to_stdout(u'[download] Resuming download at byte %s' % resume_len)
def report_retry(self, count, retries):
template_dict['ord'] = unicode('%05d' % self._num_downloads)
filename = self.params['outtmpl'] % template_dict
except (ValueError, KeyError), err:
- self.trouble('ERROR: invalid output template or system charset: %s' % str(err))
+ self.trouble(u'ERROR: invalid system charset or erroneous output template')
+ return
if self.params.get('nooverwrites', False) and os.path.exists(filename):
self.to_stderr(u'WARNING: file exists: %s; skipping' % filename)
return
try:
stream.write(data_block)
except (IOError, OSError), err:
- self.trouble('\nERROR: unable to write data: %s' % str(err))
+ self.trouble(u'\nERROR: unable to write data: %s' % str(err))
+ return False
block_size = self.best_block_size(after - before, data_block_len)
# Progress message
# Parse command line
parser = optparse.OptionParser(
usage='Usage: %prog [options] url...',
- version='2010.07.24',
+ version='2010.08.04',
conflict_handler='resolve',
)