From 1b5a268498216bcdf9103e518a9ef3348f259582 Mon Sep 17 00:00:00 2001 From: codesparkle Date: Thu, 22 May 2014 16:38:27 +1000 Subject: [PATCH] The `youtube_dl/FileDownloader` says: `# Legacy file for backwards compatibility, use youtube_dl.downloader instead!` So I checked for usages of this class, and it turns out the only place it is used is in `youtube_dl/__init__.py`. Actually, the only method used is `FileDownloader.parse_bytes`, which is defined as a static method in `.downloader/FileDownloader` anyway! The old `FileDownloader._do_download` is never used. To summarize, the class can safely be deleted (unless my IDE and I missed something). --- youtube_dl/FileDownloader.py | 12 ------------ youtube_dl/__init__.py | 6 +----- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 youtube_dl/FileDownloader.py diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py deleted file mode 100644 index 5c8e676a2..000000000 --- a/youtube_dl/FileDownloader.py +++ /dev/null @@ -1,12 +0,0 @@ -# Legacy file for backwards compatibility, use youtube_dl.downloader instead! -from .downloader import FileDownloader as RealFileDownloader -from .downloader import get_suitable_downloader - - -# This class reproduces the old behaviour of FileDownloader -class FileDownloader(RealFileDownloader): - def _do_download(self, filename, info_dict): - real_fd = get_suitable_downloader(info_dict)(self.ydl, self.params) - for ph in self._progress_hooks: - real_fd.add_progress_hook(ph) - return real_fd.download(filename, info_dict) diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index cbb053e13..92097f41e 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -63,14 +63,13 @@ __license__ = 'Public Domain' import codecs import io -import locale import optparse import os import random -import re import shlex import sys +from .downloader import FileDownloader from .utils import ( compat_getpass, @@ -90,9 +89,6 @@ from .utils import ( write_string, ) from .update import update_self -from .FileDownloader import ( - FileDownloader, -) from .extractor import gen_extractors from .version import __version__ from .YoutubeDL import YoutubeDL