diff options
author | Philipp Hagemeister <phihag@phihag.de> | 2012-05-31 00:04:32 -0700 |
---|---|---|
committer | Philipp Hagemeister <phihag@phihag.de> | 2012-05-31 00:04:32 -0700 |
commit | a047951477096e6d5bb52f8ee37330a0104d95f0 (patch) | |
tree | 894ab907249b6a40fdda0928dc6c4bfdf5eab3ff /youtube_dl/InfoExtractors.py | |
parent | f36cd076850faf4b2859a168fcb740dfccb9eed6 (diff) | |
parent | 6ab92c8b622ba4691bee8ad36da0614c1f892511 (diff) | |
download | youtube-dl-a047951477096e6d5bb52f8ee37330a0104d95f0.tar.xz |
Merge pull request #352 from chocolateboy/decontaminate_stdout
don't corrupt stdout (-o -) in verbose mode
Diffstat (limited to 'youtube_dl/InfoExtractors.py')
-rw-r--r-- | youtube_dl/InfoExtractors.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index 0fc39163e..40f96ad76 100644 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -181,7 +181,7 @@ class YoutubeIE(InfoExtractor): start = "%02i:%02i:%02i,%03i" %(start/(60*60), start/60%60, start%60, start%1*1000) end = "%02i:%02i:%02i,%03i" %(end/(60*60), end/60%60, end%60, end%1*1000) caption = unescapeHTML(caption) - caption = unescapeHTML(caption) # double cycle, inentional + caption = unescapeHTML(caption) # double cycle, intentional srt += str(n) + '\n' srt += start + ' --> ' + end + '\n' srt += caption + '\n\n' @@ -2450,7 +2450,7 @@ class SoundcloudIE(InfoExtractor): try: upload_date = datetime.datetime.strptime(mobj.group(1), '%B %d, %Y %H:%M').strftime('%Y%m%d') except Exception, e: - print str(e) + self._downloader.to_stderr(str(e)) # for soundcloud, a request to a cross domain is required for cookies request = urllib2.Request('http://media.soundcloud.com/crossdomain.xml', std_headers) |