From: Philipp Hagemeister Date: Mon, 23 Dec 2013 15:03:06 +0000 (+0100) Subject: Remove dead code X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=dabc127362ddfe88996e72b7e0d5cd2e4f239c98;p=youtube-dl Remove dead code --- diff --git a/youtube_dl/downloader/common.py b/youtube_dl/downloader/common.py index e9c9b4473..10143d56a 100644 --- a/youtube_dl/downloader/common.py +++ b/youtube_dl/downloader/common.py @@ -1,7 +1,5 @@ -import math import os import re -import subprocess import sys import time @@ -175,7 +173,7 @@ class FileDownloader(object): return os.rename(encodeFilename(old_filename), encodeFilename(new_filename)) except (IOError, OSError) as err: - self.report_error(u'unable to rename file') + self.report_error(u'unable to rename file: %s' % str(err)) def try_utime(self, filename, last_modified_hdr): """Try to set the last-modified time of the given file.""" @@ -279,8 +277,6 @@ class FileDownloader(object): """Download to a filename using the info from info_dict Return True on success and False otherwise """ - url = info_dict['url'] - # Check file already present if self.params.get('continuedl', False) and os.path.isfile(encodeFilename(filename)) and not self.params.get('nopart', False): self.report_file_already_downloaded(filename) @@ -290,8 +286,8 @@ class FileDownloader(object): 'total_bytes': os.path.getsize(encodeFilename(filename)), }) return True - else: - return self.real_download(filename, info_dict) + + return self.real_download(filename, info_dict) def real_download(self, filename, info_dict): """Real download process. Redefine in subclasses.""" diff --git a/youtube_dl/downloader/http.py b/youtube_dl/downloader/http.py index dbc5af3ca..14b88efd3 100644 --- a/youtube_dl/downloader/http.py +++ b/youtube_dl/downloader/http.py @@ -1,7 +1,4 @@ import os -import re -import subprocess -import sys import time from .common import FileDownloader diff --git a/youtube_dl/extractor/bliptv.py b/youtube_dl/extractor/bliptv.py index a32891c17..c7e0a53c1 100644 --- a/youtube_dl/extractor/bliptv.py +++ b/youtube_dl/extractor/bliptv.py @@ -1,6 +1,5 @@ import datetime import json -import os import re import socket @@ -66,7 +65,6 @@ class BlipTVIE(InfoExtractor): request = compat_urllib_request.Request(json_url) request.add_header('User-Agent', 'iTunes/10.6.1') self.report_extraction(mobj.group(1)) - info = None urlh = self._request_webpage(request, None, False, u'unable to download video info webpage')