From 05be634f5455cdc4aaff21448517f184693a6285 Mon Sep 17 00:00:00 2001 From: SavinaRoja Date: Sat, 5 Oct 2013 21:58:33 -0400 Subject: [PATCH] Commenting out code for netrc conflict with username and password, should no longer be necessary --- youtube_dl/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 2635bcaff..3d6b7c00a 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -656,8 +656,8 @@ def _real_main(argv=None): # Conflicting, missing and erroneous options - if opts['--netrc'] and (opts['--username'] or opts['--password']): - parser.error(u'using .netrc conflicts with giving username/password') + #if opts['--netrc'] and (opts['--username'] or opts['--password']): + # parser.error(u'using .netrc conflicts with giving username/password') if opts['--password'] and not opts['--username']: parser.error(u' account username missing\n') if opts.outtmpl is not None and (opts.usetitle or opts.autonumber or opts.useid):