projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[core] Decode environment variables with filesystem encoding (Fixes #3854, Fixes...
[youtube-dl]
/
youtube_dl
/
YoutubeDL.py
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index b485dbdf1c61eda1b4b6817bce353f119a416e14..34a1e3b5c3fcc334b634c276a0e181f5d2cfb7ff 100755
(executable)
--- a/
youtube_dl/YoutubeDL.py
+++ b/
youtube_dl/YoutubeDL.py
@@
-24,6
+24,7
@@
if os.name == 'nt':
from .utils import (
compat_cookiejar,
from .utils import (
compat_cookiejar,
+ compat_expanduser,
compat_http_client,
compat_str,
compat_urllib_error,
compat_http_client,
compat_str,
compat_urllib_error,
@@
-447,7
+448,7
@@
class YoutubeDL(object):
template_dict = collections.defaultdict(lambda: 'NA', template_dict)
outtmpl = self.params.get('outtmpl', DEFAULT_OUTTMPL)
template_dict = collections.defaultdict(lambda: 'NA', template_dict)
outtmpl = self.params.get('outtmpl', DEFAULT_OUTTMPL)
- tmpl =
os.path.
expanduser(outtmpl)
+ tmpl =
compat_
expanduser(outtmpl)
filename = tmpl % template_dict
return filename
except ValueError as err:
filename = tmpl % template_dict
return filename
except ValueError as err:
@@
-1250,7
+1251,7
@@
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
- req_is_string = isinstance(req, basestring)
+ 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)
url = req if req_is_string else req.get_full_url()
url_escaped = escape_url(url)