diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2012-05-31 00:04:32 -0700 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2012-05-31 00:04:32 -0700 |
| commit | a047951477096e6d5bb52f8ee37330a0104d95f0 (patch) | |
| tree | 894ab907249b6a40fdda0928dc6c4bfdf5eab3ff /youtube_dl/__init__.py | |
| parent | f36cd076850faf4b2859a168fcb740dfccb9eed6 (diff) | |
| parent | 6ab92c8b622ba4691bee8ad36da0614c1f892511 (diff) | |
Merge pull request #352 from chocolateboy/decontaminate_stdout
don't corrupt stdout (-o -) in verbose mode
Diffstat (limited to 'youtube_dl/__init__.py')
| -rw-r--r-- | youtube_dl/__init__.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 73590ecd6..827b58264 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -396,9 +396,6 @@ def _real_main(): urllib2.install_opener(opener) socket.setdefaulttimeout(300) # 5 minutes should be enough (famous last words) - if opts.verbose: - print(u'[debug] Proxy map: ' + str(proxy_handler.proxies)) - extractors = gen_extractors() if opts.list_extractors: @@ -496,6 +493,10 @@ def _real_main(): 'prefer_free_formats': opts.prefer_free_formats, 'verbose': opts.verbose, }) + + if opts.verbose: + fd.to_screen(u'[debug] Proxy map: ' + str(proxy_handler.proxies)) + for extractor in extractors: fd.add_info_extractor(extractor) |