dbrun
/
youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename error_to_str to error_to_compat_str

This commit is contained in:
Sergey M․ 2015-12-20 07:00:39 +06:00
parent d890b4cc0a
commit 9b9c5355e4
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/YoutubeDL.py
View File

@ -49,7 +49,7 @@ from .utils import (
DownloadError,
encode_compat_str,
encodeFilename,
error_to_str,
error_to_compat_str,
ExtractorError,
format_bytes,
formatSeconds,
@ -683,7 +683,7 @@ class YoutubeDL(object):
raise
except Exception as e:
if self.params.get('ignoreerrors', False):
self.report_error(error_to_str(e), tb=encode_compat_str(traceback.format_exc()))
self.report_error(error_to_compat_str(e), tb=encode_compat_str(traceback.format_exc()))
break
else:
raise
@ -1461,7 +1461,7 @@ class YoutubeDL(object):
if dn and not os.path.exists(dn):
os.makedirs(dn)
except (OSError, IOError) as err:
self.report_error('unable to create directory ' + error_to_str(err))
self.report_error('unable to create directory ' + error_to_compat_str(err))
return
if self.params.get('writedescription', False):
@ -1512,7 +1512,7 @@ class YoutubeDL(object):
sub_info['url'], info_dict['id'], note=False)
except ExtractorError as err:
self.report_warning('Unable to download subtitle for "%s": %s' %
(sub_lang, error_to_str(err.cause)))
(sub_lang, error_to_compat_str(err.cause)))
continue
try:
sub_filename = subtitles_filename(filename, sub_lang, sub_format)
@ -2041,4 +2041,4 @@ class YoutubeDL(object):
(info_dict['extractor'], info_dict['id'], thumb_display_id, thumb_filename))
except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
self.report_warning('Unable to download thumbnail "%s": %s' %
(t['url'], error_to_str(err)))
(t['url'], error_to_compat_str(err)))

4
youtube_dl/downloader/common.py
View File

@ -7,7 +7,7 @@ import time
from ..utils import (
encodeFilename,
error_to_str,
error_to_compat_str,
decodeArgument,
format_bytes,
timeconvert,
@ -186,7 +186,7 @@ class FileDownloader(object):
return
os.rename(encodeFilename(old_filename), encodeFilename(new_filename))
except (IOError, OSError) as err:
self.report_error('unable to rename file: %s' % error_to_str(err))
self.report_error('unable to rename file: %s' % error_to_compat_str(err))
def try_utime(self, filename, last_modified_hdr):
"""Try to set the last-modified time of the given file."""

6
youtube_dl/extractor/common.py
View File

@ -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)

4
youtube_dl/extractor/dailymotion.py
View File

@ -9,7 +9,7 @@ from .common import InfoExtractor
from ..utils import (
determine_ext,
error_to_str,
error_to_compat_str,
ExtractorError,
int_or_none,
parse_iso8601,
@ -278,7 +278,7 @@ class DailymotionIE(DailymotionBaseInfoExtractor):
'https://api.dailymotion.com/video/%s/subtitles?fields=id,language,url' % video_id,
video_id, note=False)
except ExtractorError as err:
self._downloader.report_warning('unable to download video subtitles: %s' % error_to_str(err))
self._downloader.report_warning('unable to download video subtitles: %s' % error_to_compat_str(err))
return {}
info = json.loads(sub_list)
if (info['total'] > 0):

4
youtube_dl/extractor/facebook.py
View File

@ -11,7 +11,7 @@ from ..compat import (
compat_urllib_parse_unquote,
)
from ..utils import (
error_to_str,
error_to_compat_str,
ExtractorError,
limit_length,
sanitized_Request,
@ -116,7 +116,7 @@ class FacebookIE(InfoExtractor):
if re.search(r'id="checkpointSubmitButton"', check_response) is not None:
self._downloader.report_warning('Unable to confirm login, you have to login in your brower and authorize the login.')
except (compat_urllib_error.URLError, compat_http_client.HTTPException, socket.error) as err:
self._downloader.report_warning('unable to log in: %s' % error_to_str(err))
self._downloader.report_warning('unable to log in: %s' % error_to_compat_str(err))
return
def _real_initialize(self):

4
youtube_dl/extractor/youtube.py
View File

@ -26,7 +26,7 @@ from ..compat import (
from ..utils import (
clean_html,
encode_dict,
error_to_str,
error_to_compat_str,
ExtractorError,
float_or_none,
get_element_by_attribute,
@ -904,7 +904,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
'https://video.google.com/timedtext?hl=en&type=list&v=%s' % video_id,
video_id, note=False)
except ExtractorError as err:
self._downloader.report_warning('unable to download video subtitles: %s' % error_to_str(err))
self._downloader.report_warning('unable to download video subtitles: %s' % error_to_compat_str(err))
return {}
sub_lang_list = {}

2
youtube_dl/utils.py
View File

@ -1810,7 +1810,7 @@ def args_to_str(args):
return ' '.join(shlex_quote(a) for a in args)
def error_to_str(err):
def error_to_compat_str(err):
err_str = str(err)
# On python 2 error byte string must be decoded with proper
# encoding rather than ascii