diff options
| author | Sergey M․ <dstftw@gmail.com> | 2016-03-19 20:51:30 +0600 | 
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2016-03-19 20:51:30 +0600 | 
| commit | 617e58d85063b68fb9736355e8354b05e82b1147 (patch) | |
| tree | 2ff064c5003f51ca26c24dc2e0dcebcbf0cdd516 /youtube_dl/downloader/common.py | |
| parent | e33baba0dd6584475f75badec2186a7d86b88a5d (diff) | |
[downloader/{common,fragment}] Fix total retries reporting on python 2.6
Diffstat (limited to 'youtube_dl/downloader/common.py')
| -rw-r--r-- | youtube_dl/downloader/common.py | 8 | 
1 files changed, 7 insertions, 1 deletions
diff --git a/youtube_dl/downloader/common.py b/youtube_dl/downloader/common.py index f39db58f6..1dba9f49a 100644 --- a/youtube_dl/downloader/common.py +++ b/youtube_dl/downloader/common.py @@ -116,6 +116,10 @@ class FileDownloader(object):          return '%10s' % ('%s/s' % format_bytes(speed))      @staticmethod +    def format_retries(retries): +        return 'inf' if retries == float('inf') else '%.0f' % retries + +    @staticmethod      def best_block_size(elapsed_time, bytes):          new_min = max(bytes / 2.0, 1.0)          new_max = min(max(bytes * 2.0, 1.0), 4194304)  # Do not surpass 4 MB @@ -297,7 +301,9 @@ class FileDownloader(object):      def report_retry(self, count, retries):          """Report retry in case of HTTP error 5xx""" -        self.to_screen('[download] Got server HTTP error. Retrying (attempt %d of %.0f)...' % (count, retries)) +        self.to_screen( +            '[download] Got server HTTP error. Retrying (attempt %d of %s)...' +            % (count, self.format_retries(retries)))      def report_file_already_downloaded(self, file_name):          """Report file has already been fully downloaded."""  | 
