aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2012-10-19 05:48:12 -0700
committerPhilipp Hagemeister <phihag@phihag.de>2012-10-19 05:48:12 -0700
commit9248cb0549674ca78e1a51ebc98eb5c5a29876e8 (patch)
tree359fa4fe28601f43c77f1370e369338837acefdc /youtube_dl
parent902b2a0a45d397089807182354c34fbbd56719af (diff)
parent6b41b6111966400925dd648420f11704ac9dbbf2 (diff)
Merge pull request #472 from gcmalloc/master
Test proposal
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/FileDownloader.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index 38c6a519a..ed5a79f13 100644
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@ -13,7 +13,7 @@ import urllib2
if os.name == 'nt':
import ctypes
-
+
from utils import *
@@ -173,7 +173,6 @@ class FileDownloader(object):
if not self.params.get('quiet', False):
terminator = [u'\n', u''][skip_eol]
output = message + terminator
-
if 'b' not in self._screen_file.mode or sys.version_info[0] < 3: # Python 2 lies about the mode of sys.stdout/sys.stderr
output = output.encode(preferredencoding(), 'ignore')
self._screen_file.write(output)
@@ -357,7 +356,7 @@ class FileDownloader(object):
raise MaxDownloadsReached()
filename = self.prepare_filename(info_dict)
-
+
# Forced printings
if self.params.get('forcetitle', False):
print info_dict['title'].encode(preferredencoding(), 'xmlcharrefreplace')
@@ -399,10 +398,10 @@ class FileDownloader(object):
except (OSError, IOError):
self.trouble(u'ERROR: Cannot write description file ' + descfn)
return
-
+
if self.params.get('writesubtitles', False) and 'subtitles' in info_dict and info_dict['subtitles']:
# subtitles download errors are already managed as troubles in relevant IE
- # that way it will silently go on when used with unsupporting IE
+ # that way it will silently go on when used with unsupporting IE
try:
srtfn = filename.rsplit('.', 1)[0] + u'.srt'
self.report_writesubtitles(srtfn)
@@ -448,7 +447,7 @@ class FileDownloader(object):
except (ContentTooShortError, ), err:
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)