|
@@ -16,7 +16,31 @@ import traceback
|
|
if os.name == 'nt':
|
|
if os.name == 'nt':
|
|
import ctypes
|
|
import ctypes
|
|
|
|
|
|
-from .utils import *
|
|
|
|
|
|
+from .utils import (
|
|
|
|
+ compat_http_client,
|
|
|
|
+ compat_print,
|
|
|
|
+ compat_str,
|
|
|
|
+ compat_urllib_error,
|
|
|
|
+ compat_urllib_request,
|
|
|
|
+ ContentTooShortError,
|
|
|
|
+ date_from_str,
|
|
|
|
+ DateRange,
|
|
|
|
+ determine_ext,
|
|
|
|
+ DownloadError,
|
|
|
|
+ encodeFilename,
|
|
|
|
+ ExtractorError,
|
|
|
|
+ locked_file,
|
|
|
|
+ MaxDownloadsReached,
|
|
|
|
+ PostProcessingError,
|
|
|
|
+ preferredencoding,
|
|
|
|
+ SameFileError,
|
|
|
|
+ sanitize_filename,
|
|
|
|
+ subtitles_filename,
|
|
|
|
+ takewhile_inclusive,
|
|
|
|
+ UnavailableVideoError,
|
|
|
|
+ write_json_file,
|
|
|
|
+ write_string,
|
|
|
|
+)
|
|
from .extractor import get_info_extractor, gen_extractors
|
|
from .extractor import get_info_extractor, gen_extractors
|
|
from .FileDownloader import FileDownloader
|
|
from .FileDownloader import FileDownloader
|
|
|
|
|
|
@@ -267,7 +291,7 @@ class YoutubeDL(object):
|
|
"""Report file has already been fully downloaded."""
|
|
"""Report file has already been fully downloaded."""
|
|
try:
|
|
try:
|
|
self.to_screen(u'[download] %s has already been downloaded' % file_name)
|
|
self.to_screen(u'[download] %s has already been downloaded' % file_name)
|
|
- except (UnicodeEncodeError) as err:
|
|
|
|
|
|
+ except UnicodeEncodeError:
|
|
self.to_screen(u'[download] The file has already been downloaded')
|
|
self.to_screen(u'[download] The file has already been downloaded')
|
|
|
|
|
|
def increment_downloads(self):
|
|
def increment_downloads(self):
|