projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d67e097
)
Use unicode strings for several error messages that were missing the "u"
author
Ricardo Garcia
<sarbalap+freshmeat@gmail.com>
Thu, 12 Aug 2010 16:42:26 +0000
(18:42 +0200)
committer
Ricardo Garcia
<sarbalap+freshmeat@gmail.com>
Sun, 31 Oct 2010 10:28:41 +0000
(11:28 +0100)
youtube-dl
patch
|
blob
|
history
diff --git
a/youtube-dl
b/youtube-dl
index fb231ae400d7e32cb70407395d48c940564bcf76..717d97d9673efc775bfdab9e873ec30bcaec0f98 100755
(executable)
--- a/
youtube-dl
+++ b/
youtube-dl
@@
-413,7
+413,7
@@
class FileDownloader(object):
try:
self.pmkdir(filename)
except (OSError, IOError), err:
try:
self.pmkdir(filename)
except (OSError, IOError), err:
- self.trouble('ERROR: unable to create directories: %s' % str(err))
+ self.trouble(
u
'ERROR: unable to create directories: %s' % str(err))
return
try:
return
try:
@@
-421,17
+421,17
@@
class FileDownloader(object):
except (OSError, IOError), err:
raise UnavailableVideoError
except (urllib2.URLError, httplib.HTTPException, socket.error), err:
except (OSError, IOError), err:
raise UnavailableVideoError
except (urllib2.URLError, httplib.HTTPException, socket.error), err:
- self.trouble('ERROR: unable to download video data: %s' % str(err))
+ self.trouble(
u
'ERROR: unable to download video data: %s' % str(err))
return
except (ContentTooShortError, ), err:
return
except (ContentTooShortError, ), err:
- self.trouble('ERROR: content too short (expected %s bytes and served %s)' % (err.expected, err.downloaded))
+ self.trouble(
u
'ERROR: content too short (expected %s bytes and served %s)' % (err.expected, err.downloaded))
return
if success:
try:
self.post_process(filename, info_dict)
except (PostProcessingError), err:
return
if success:
try:
self.post_process(filename, info_dict)
except (PostProcessingError), err:
- self.trouble('ERROR: postprocessing: %s' % str(err))
+ self.trouble(
u
'ERROR: postprocessing: %s' % str(err))
return
def download(self, url_list):
return
def download(self, url_list):
@@
-456,7
+456,7
@@
class FileDownloader(object):
break
if not suitable_found:
break
if not suitable_found:
- self.trouble('ERROR: no suitable InfoExtractor: %s' % url)
+ self.trouble(
u
'ERROR: no suitable InfoExtractor: %s' % url)
return self._download_retcode
return self._download_retcode
@@
-496,7
+496,7
@@
class FileDownloader(object):
self.to_stdout(u'\r[rtmpdump] %s bytes' % os.path.getsize(filename))
return True
else:
self.to_stdout(u'\r[rtmpdump] %s bytes' % os.path.getsize(filename))
return True
else:
- self.trouble('\nERROR: rtmpdump exited with code %d' % retval)
+ self.trouble(
u
'\nERROR: rtmpdump exited with code %d' % retval)
return False
def _do_download(self, filename, url, player_url):
return False
def _do_download(self, filename, url, player_url):
@@
-589,7
+589,7
@@
class FileDownloader(object):
(stream, filename) = sanitize_open(filename, open_mode)
self.report_destination(filename)
except (OSError, IOError), err:
(stream, filename) = sanitize_open(filename, open_mode)
self.report_destination(filename)
except (OSError, IOError), err:
- self.trouble('ERROR: unable to open for writing: %s' % str(err))
+ self.trouble(
u
'ERROR: unable to open for writing: %s' % str(err))
return False
try:
stream.write(data_block)
return False
try:
stream.write(data_block)