projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'vgtv' of https://github.com/mrkolby/youtube-dl into mrkolby-vgtv
[youtube-dl]
/
youtube_dl
/
downloader
/
common.py
diff --git
a/youtube_dl/downloader/common.py
b/youtube_dl/downloader/common.py
index 10143d56a201ca9d7b9b919ab38880adea0c1cf6..9ce97f5fe6c4517ec8b6d681e924bcd387a185cf 100644
(file)
--- a/
youtube_dl/downloader/common.py
+++ b/
youtube_dl/downloader/common.py
@@
-4,9
+4,10
@@
import sys
import time
from ..utils import (
import time
from ..utils import (
+ compat_str,
encodeFilename,
encodeFilename,
- timeconvert,
format_bytes,
format_bytes,
+ timeconvert,
)
)
@@
-173,7
+174,7
@@
class FileDownloader(object):
return
os.rename(encodeFilename(old_filename), encodeFilename(new_filename))
except (IOError, OSError) as err:
return
os.rename(encodeFilename(old_filename), encodeFilename(new_filename))
except (IOError, OSError) as err:
- self.report_error(u'unable to rename file: %s' % str(err))
+ self.report_error(u'unable to rename file: %s' %
compat_
str(err))
def try_utime(self, filename, last_modified_hdr):
"""Try to set the last-modified time of the given file."""
def try_utime(self, filename, last_modified_hdr):
"""Try to set the last-modified time of the given file."""
@@
-291,7
+292,7
@@
class FileDownloader(object):
def real_download(self, filename, info_dict):
"""Real download process. Redefine in subclasses."""
def real_download(self, filename, info_dict):
"""Real download process. Redefine in subclasses."""
- raise NotImplementedError(u'This method must be implemented by sub
lc
asses')
+ raise NotImplementedError(u'This method must be implemented by sub
cl
asses')
def _hook_progress(self, status):
for ph in self._progress_hooks:
def _hook_progress(self, status):
for ph in self._progress_hooks:
@@
-314,4
+315,3
@@
class FileDownloader(object):
if the download is successful.
"""
self._progress_hooks.append(ph)
if the download is successful.
"""
self._progress_hooks.append(ph)
-