aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-07-20 12:49:24 +0200
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2013-08-28 15:14:02 +0200
commit920ef0779b6bcd5131e237e5c2ca28361f6d45d6 (patch)
treee7c0bf05b74263a9123b5972fc7aad0bfc25811d
parentccf4b799df0f97df5f745f38af96666386766754 (diff)
Hide the password and username in verbose mode (closes #1089)
-rw-r--r--youtube_dl/__init__.py16
1 files changed, 13 insertions, 3 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index b33a18a26..431460c57 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -100,6 +100,16 @@ def parseOpts(overrideArguments=None):
pass
return None
+ def _hide_login_info(opts):
+ opts = list(opts)
+ for private_opt in ['-p', '--password', '-u', '--username']:
+ try:
+ i = opts.index(private_opt)
+ opts[i+1] = '<PRIVATE>'
+ except ValueError:
+ pass
+ return opts
+
max_width = 80
max_help_position = 80
@@ -358,9 +368,9 @@ def parseOpts(overrideArguments=None):
argv = systemConf + userConf + commandLineConf
opts, args = parser.parse_args(argv)
if opts.verbose:
- sys.stderr.write(u'[debug] System config: ' + repr(systemConf) + '\n')
- sys.stderr.write(u'[debug] User config: ' + repr(userConf) + '\n')
- sys.stderr.write(u'[debug] Command-line args: ' + repr(commandLineConf) + '\n')
+ sys.stderr.write(u'[debug] System config: ' + repr(_hide_login_info(systemConf)) + '\n')
+ sys.stderr.write(u'[debug] User config: ' + repr(_hide_login_info(userConf)) + '\n')
+ sys.stderr.write(u'[debug] Command-line args: ' + repr(_hide_login_info(commandLineConf)) + '\n')
return parser, opts, args