summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-06-27 17:58:42 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-06-27 17:58:42 +0200
commit500f3d24324c8d9a53af2a55d9b3dd8c3db79eab (patch)
treeea2020d56816a28427e3bd80449e69da341b2a26
parented4a915e08927bad25db70b489972fa68c9ad0bb (diff)
parentc90f13d1067067e0532dfc1666c1743366bc4d31 (diff)
downloadyoutube-dl-500f3d24324c8d9a53af2a55d9b3dd8c3db79eab.tar.gz
youtube-dl-500f3d24324c8d9a53af2a55d9b3dd8c3db79eab.tar.xz
youtube-dl-500f3d24324c8d9a53af2a55d9b3dd8c3db79eab.zip
Merge remote-tracking branch 'origin/HEAD'
-rw-r--r--youtube_dl/extractor/youtube.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py
index c7922c533..6c8aa9ade 100644
--- a/youtube_dl/extractor/youtube.py
+++ b/youtube_dl/extractor/youtube.py
@@ -130,7 +130,7 @@ class YoutubeIE(InfoExtractor):
         self.to_screen(u'RTMP download detected')
 
     def _decrypt_signature(self, s):
-        """Decrypt the key the two subkeys must have a length of 43"""
+        """Decrypt the key"""
 
         if len(s) == 88:
             return s[48] + s[81:67:-1] + s[82] + s[66:62:-1] + s[85] + s[61:48:-1] + s[67] + s[47:12:-1] + s[3] + s[11:3:-1] + s[2] + s[12]
@@ -148,7 +148,7 @@ class YoutubeIE(InfoExtractor):
             return s[36] + s[79:67:-1] + s[81] + s[66:40:-1] + s[33] + s[39:36:-1] + s[40] + s[35] + s[0] + s[67] + s[32:0:-1] + s[34]
 
         else:
-            raise ExtractorError(u'Unable to decrypt signature, subkeys length %d not supported; retrying might work' % (len(s)))
+            raise ExtractorError(u'Unable to decrypt signature, key length %d not supported; retrying might work' % (len(s)))
 
     def _get_available_subtitles(self, video_id):
         self.report_video_subtitles_download(video_id)