diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-11-23 21:33:31 +0100 | 
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-11-23 21:33:31 +0100 | 
| commit | 784b6d3a9bc79fe55a8b132fd10555c1e9a61c31 (patch) | |
| tree | e9a7996c44fd8d07f0bef5cdebbafdbe9c0b7bb4 /youtube_dl/extractor/common.py | |
| parent | f3a34072266c0a7595f73fa032685cf8a50d2ab4 (diff) | |
| parent | 2514d2635e0c8ff0fb72d00a093a849001df2bdd (diff) | |
Merge remote-tracking branch 'jtwaleson/master'
Diffstat (limited to 'youtube_dl/extractor/common.py')
| -rw-r--r-- | youtube_dl/extractor/common.py | 7 | 
1 files changed, 4 insertions, 3 deletions
| diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 93a5a3d57..f0489ede4 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -423,17 +423,18 @@ class InfoExtractor(object):          """Report attempt to log in."""          self.to_screen('Logging in') -    #Methods for following #608 +    # Methods for following #608      @staticmethod      def url_result(url, ie=None, video_id=None):          """Returns a url that points to a page that should be processed""" -        #TODO: ie should be the class used for getting the info +        # TODO: ie should be the class used for getting the info          video_info = {'_type': 'url',                        'url': url,                        'ie_key': ie}          if video_id is not None:              video_info['id'] = video_id          return video_info +      @staticmethod      def playlist_result(entries, playlist_id=None, playlist_title=None):          """Returns a playlist""" @@ -517,7 +518,7 @@ class InfoExtractor(object):                      raise netrc.NetrcParseError('No authenticators for %s' % self._NETRC_MACHINE)              except (IOError, netrc.NetrcParseError) as err:                  self._downloader.report_warning('parsing .netrc: %s' % compat_str(err)) -         +          return (username, password)      def _get_tfa_info(self): | 
