projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added extractor for crunchyroll 'playlists' i.e. series. so that one can, e.g. downlo...
[youtube-dl]
/
youtube_dl
/
YoutubeDL.py
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index a1713dc5ad7d3e8f79fe15223a88300b9f4434fb..dec0e20e7907d9fcf0110d6c992f14456336580d 100755
(executable)
--- a/
youtube_dl/YoutubeDL.py
+++ b/
youtube_dl/YoutubeDL.py
@@
-228,11
+228,11
@@
class YoutubeDL(object):
if (sys.version_info >= (3,) and sys.platform != 'win32' and
sys.getfilesystemencoding() in ['ascii', 'ANSI_X3.4-1968']
if (sys.version_info >= (3,) and sys.platform != 'win32' and
sys.getfilesystemencoding() in ['ascii', 'ANSI_X3.4-1968']
- and not params
['restrictfilenames']
):
+ and not params
.get('restrictfilenames', False)
):
# On Python 3, the Unicode filesystem API will throw errors (#1474)
self.report_warning(
'Assuming --restrict-filenames since file system encoding '
# On Python 3, the Unicode filesystem API will throw errors (#1474)
self.report_warning(
'Assuming --restrict-filenames since file system encoding '
- 'cannot encode all charactes. '
+ 'cannot encode all characte
r
s. '
'Set the LC_ALL environment variable to fix this.')
self.params['restrictfilenames'] = True
'Set the LC_ALL environment variable to fix this.')
self.params['restrictfilenames'] = True
@@
-1250,12
+1250,13
@@
class YoutubeDL(object):
# urllib chokes on URLs with non-ASCII characters (see http://bugs.python.org/issue3991)
# To work around aforementioned issue we will replace request's original URL with
# percent-encoded one
# urllib chokes on URLs with non-ASCII characters (see http://bugs.python.org/issue3991)
# To work around aforementioned issue we will replace request's original URL with
# percent-encoded one
- url = req if isinstance(req, compat_str) else req.get_full_url()
+ req_is_string = isinstance(req, basestring if sys.version_info < (3, 0) else compat_str)
+ url = req if req_is_string else req.get_full_url()
url_escaped = escape_url(url)
# Substitute URL if any change after escaping
if url != url_escaped:
url_escaped = escape_url(url)
# Substitute URL if any change after escaping
if url != url_escaped:
- if
isinstance(req, compat_str)
:
+ if
req_is_string
:
req = url_escaped
else:
req = compat_urllib_request.Request(
req = url_escaped
else:
req = compat_urllib_request.Request(