X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fcommon.py;h=828f58f126393531f1f0481faeff473e68b3ecb1;hb=9b9c5355e4c0fe6f9028aaa3b1b8beb28a085433;hp=5659e40c850aaf5f3eeedf0a03191c4b0532e798;hpb=d890b4cc0ac6b88daa917a1a791afe7541cd0411;p=youtube-dl diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 5659e40c8..828f58f12 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -30,7 +30,7 @@ from ..utils import ( clean_html, compiled_regex_type, determine_ext, - error_to_str, + error_to_compat_str, ExtractorError, fix_xml_ampersands, float_or_none, @@ -334,7 +334,7 @@ class InfoExtractor(object): if errnote is None: errnote = 'Unable to download webpage' - errmsg = '%s: %s' % (errnote, error_to_str(err)) + errmsg = '%s: %s' % (errnote, error_to_compat_str(err)) if fatal: raise ExtractorError(errmsg, sys.exc_info()[2], cause=err) else: @@ -624,7 +624,7 @@ class InfoExtractor(object): else: raise netrc.NetrcParseError('No authenticators for %s' % self._NETRC_MACHINE) except (IOError, netrc.NetrcParseError) as err: - self._downloader.report_warning('parsing .netrc: %s' % error_to_str(err)) + self._downloader.report_warning('parsing .netrc: %s' % error_to_compat_str(err)) return (username, password)