Merge branch 'master' of github.com:rg3/youtube-dl

diff --combined youtube_dl/extractor/common.py
index 8db72ba7afb480cbd9a894be78c0e1774556af52,0f6049cb43306537be089d27404ccb05d69d10a9..1d98222ce6518398fd2a1381100400d5bacb99c0
--- 1/youtube_dl/extractor/common.py
--- 2/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@@ -3,6 -3,7 +3,7 @@@ import o
  import re
  import socket
  import sys
+ import netrc
  
  from ..utils import (
      compat_http_client,
@@@ -36,8 -37,6 +37,8 @@@ class InfoExtractor(object)
      The following fields are optional:
  
      format:         The video format, defaults to ext (used for --get-format)
 +    thumbnails:     A list of dictionaries (with the entries "resolution" and
 +                    "url") for the varying thumbnails
      thumbnail:      Full URL to a video thumbnail image.
      description:    One-line video description.
      uploader:       Full name of the video uploader.
@@@ -163,6 -162,10 +164,10 @@@
          """Report attempt to confirm age."""
          self.to_screen(u'Confirming age')
  
+     def report_login(self):
+         """Report attempt to log in."""
+         self.to_screen(u'Logging in')
+ 
      #Methods for following #608
      #They set the correct value of the '_type' key
      def video_result(self, video_info):
@@@ -227,6 -230,36 +232,36 @@@
          else:
              return res
  
+     def _get_login_info(self):
+         """
+         Get the the login info as (username, password)
+         It will look in the netrc file using the _NETRC_MACHINE value
+         If there's no info available, return (None, None)
+         """
+         if self._downloader is None:
+             return (None, None)
+ 
+         username = None
+         password = None
+         downloader_params = self._downloader.params
+ 
+         # Attempt to use provided username and password or .netrc data
+         if downloader_params.get('username', None) is not None:
+             username = downloader_params['username']
+             password = downloader_params['password']
+         elif downloader_params.get('usenetrc', False):
+             try:
+                 info = netrc.netrc().authenticators(self._NETRC_MACHINE)
+                 if info is not None:
+                     username = info[0]
+                     password = info[2]
+                 else:
+                     raise netrc.NetrcParseError('No authenticators for %s' % self._NETRC_MACHINE)
+             except (IOError, netrc.NetrcParseError) as err:
+                 self._downloader.report_warning(u'parsing .netrc: %s' % compat_str(err))
+         
+         return (username, password)
+ 
  class SearchInfoExtractor(InfoExtractor):
      """
      Base class for paged search queries extractors.