From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 23 Nov 2014 21:10:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'jtwaleson/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=27f8b0994e9924724c974f46435552d401f5fc08;hp=-c

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

27f8b0994e9924724c974f46435552d401f5fc08
diff --combined youtube_dl/extractor/youtube.py
index 45c85ed01,fa3ead95b..4ebc7b712
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@@ -950,7 -950,7 +950,7 @@@ class YoutubeIE(YoutubeBaseInfoExtracto
  
                          parts_sizes = self._signature_cache_id(encrypted_sig)
                          self.to_screen('{%s} signature length %s, %s' %
-                             (format_id, parts_sizes, player_desc))
+                                        (format_id, parts_sizes, player_desc))
  
                      signature = self._decrypt_signature(
                          encrypted_sig, video_id, player_url, age_gate)
@@@ -1214,7 -1214,7 +1214,7 @@@ class YoutubePlaylistIE(YoutubeBaseInfo
  class YoutubeTopListIE(YoutubePlaylistIE):
      IE_NAME = 'youtube:toplist'
      IE_DESC = ('YouTube.com top lists, "yttoplist:{channel}:{list title}"'
-         ' (Example: "yttoplist:music:Top Tracks")')
+                ' (Example: "yttoplist:music:Top Tracks")')
      _VALID_URL = r'yttoplist:(?P<chann>.*?):(?P<title>.*?)$'
      _TESTS = [{
          'url': 'yttoplist:music:Trending',
@@@ -1567,14 -1567,14 +1567,14 @@@ class YoutubeFeedsInfoExtractor(Youtube
  
  
  class YoutubeRecommendedIE(YoutubeFeedsInfoExtractor):
 -    IE_DESC = 'YouTube.com recommended videos, "ytrec" keyword (requires authentication)'
 +    IE_DESC = 'YouTube.com recommended videos, ":ytrec" for short (requires authentication)'
      _VALID_URL = r'https?://www\.youtube\.com/feed/recommended|:ytrec(?:ommended)?'
      _FEED_NAME = 'recommended'
      _PLAYLIST_TITLE = 'Youtube Recommended videos'
  
  
  class YoutubeWatchLaterIE(YoutubeFeedsInfoExtractor):
 -    IE_DESC = 'Youtube watch later list, "ytwatchlater" keyword (requires authentication)'
 +    IE_DESC = 'Youtube watch later list, ":ytwatchlater" for short (requires authentication)'
      _VALID_URL = r'https?://www\.youtube\.com/feed/watch_later|:ytwatchlater'
      _FEED_NAME = 'watch_later'
      _PLAYLIST_TITLE = 'Youtube Watch Later'
@@@ -1582,7 -1582,7 +1582,7 @@@
  
  
  class YoutubeHistoryIE(YoutubeFeedsInfoExtractor):
 -    IE_DESC = 'Youtube watch history, "ythistory" keyword (requires authentication)'
 +    IE_DESC = 'Youtube watch history, ":ythistory" for short (requires authentication)'
      _VALID_URL = 'https?://www\.youtube\.com/feed/history|:ythistory'
      _FEED_NAME = 'history'
      _PERSONAL_FEED = True
@@@ -1591,7 -1591,7 +1591,7 @@@
  
  class YoutubeFavouritesIE(YoutubeBaseInfoExtractor):
      IE_NAME = 'youtube:favorites'
 -    IE_DESC = 'YouTube.com favourite videos, "ytfav" keyword (requires authentication)'
 +    IE_DESC = 'YouTube.com favourite videos, ":ytfav" for short (requires authentication)'
      _VALID_URL = r'https?://www\.youtube\.com/my_favorites|:ytfav(?:ou?rites)?'
      _LOGIN_REQUIRED = True