projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'patch-1' of https://github.com/tuexss/youtube-dl into tuexss-patch-1
[youtube-dl]
/
youtube_dl
/
options.py
diff --git
a/youtube_dl/options.py
b/youtube_dl/options.py
index 68193a27141ed8949bdfb69d81ce1a46422ac373..9bded4521ebb5b3bee035d00a7f06a4906f58bb1 100644
(file)
--- a/
youtube_dl/options.py
+++ b/
youtube_dl/options.py
@@
-13,6
+13,7
@@
from .compat import (
compat_kwargs,
)
from .utils import (
compat_kwargs,
)
from .utils import (
+ preferredencoding,
write_string,
)
from .version import __version__
write_string,
)
from .version import __version__
@@
-797,7
+798,7
@@
def parseOpts(overrideArguments=None):
# Workaround for Python 2.x, where argv is a byte list
if sys.version_info < (3,):
command_line_conf = [
# Workaround for Python 2.x, where argv is a byte list
if sys.version_info < (3,):
command_line_conf = [
- a.decode(
'utf-8'
, 'replace') for a in command_line_conf]
+ a.decode(
preferredencoding()
, 'replace') for a in command_line_conf]
if '--ignore-config' in command_line_conf:
system_conf = []
if '--ignore-config' in command_line_conf:
system_conf = []