From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 1 Jan 2014 09:43:58 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=33ec2ae8d9450a59273d2156bd2ef77d2bd93a66;hp=-c;p=youtube-dl

Merge remote-tracking branch 'origin/master'
---

33ec2ae8d9450a59273d2156bd2ef77d2bd93a66
diff --combined youtube_dl/YoutubeDL.py
index 8ebbfe78f,738304193..3c47eb9dc
--- a/youtube_dl/YoutubeDL.py
+++ b/youtube_dl/YoutubeDL.py
@@@ -148,7 -148,6 +148,7 @@@ class YoutubeDL(object)
      socket_timeout:    Time to wait for unresponsive hosts, in seconds
      bidi_workaround:   Work around buggy terminals without bidirectional text
                         support, using fridibi
 +    debug_printtraffic:Print out sent and received HTTP traffic
  
      The following parameters are not used by YoutubeDL itself, they are used by
      the FileDownloader:
@@@ -165,6 -164,8 +165,8 @@@
  
      def __init__(self, params=None):
          """Create a FileDownloader object with the given options."""
+         if params is None:
+             params = {}
          self._ies = []
          self._ies_instances = {}
          self._pps = []
@@@ -173,7 -174,7 +175,7 @@@
          self._num_downloads = 0
          self._screen_file = [sys.stdout, sys.stderr][params.get('logtostderr', False)]
          self._err_file = sys.stderr
-         self.params = {} if params is None else params
+         self.params = params
  
          if params.get('bidi_workaround', False):
              try:
@@@ -1125,13 -1126,10 +1127,13 @@@
              if 'http' in proxies and 'https' not in proxies:
                  proxies['https'] = proxies['http']
          proxy_handler = compat_urllib_request.ProxyHandler(proxies)
 +
 +        debuglevel = 1 if self.params.get('debug_printtraffic') else 0
          https_handler = make_HTTPS_handler(
 -            self.params.get('nocheckcertificate', False))
 +            self.params.get('nocheckcertificate', False), debuglevel=debuglevel)
 +        ydlh = YoutubeDLHandler(debuglevel=debuglevel)
          opener = compat_urllib_request.build_opener(
 -            https_handler, proxy_handler, cookie_processor, YoutubeDLHandler())
 +            https_handler, proxy_handler, cookie_processor, ydlh)
          # Delete the default user-agent header, which would otherwise apply in
          # cases where our custom HTTP handler doesn't come into play
          # (See https://github.com/rg3/youtube-dl/issues/1309 for details)