Merge tag 'upstream/2013.06.33'

[youtubedl] / youtube_dl / extractor / vimeo.py

diff --git a/youtube_dl/extractor/vimeo.py b/youtube_dl/extractor/vimeo.py
index 677cf4e1c46c7e08ad1c72ac300d4e83c8229a64..20dc255d4c3e8de8dd4dd4cc30a60cb0427135de 100644 (file)
--- a/youtube_dl/extractor/vimeo.py
+++ b/youtube_dl/extractor/vimeo.py
@@ -20,9 +20,9 @@ class VimeoIE(InfoExtractor):
     IE_NAME = u'vimeo'
 
     def _verify_video_password(self, url, video_id, webpage):
     IE_NAME = u'vimeo'
 
     def _verify_video_password(self, url, video_id, webpage):

-        password = self._downloader.params.get('password', None)
+        password = self._downloader.params.get('videopassword', None)

         if password is None:
         if password is None:

-            raise ExtractorError(u'This video is protected by a password, use the --password option')
+            raise ExtractorError(u'This video is protected by a password, use the --video-password option')

         token = re.search(r'xsrft: \'(.*?)\'', webpage).group(1)
         data = compat_urllib_parse.urlencode({'password': password,
                                               'token': token})
         token = re.search(r'xsrft: \'(.*?)\'', webpage).group(1)
         data = compat_urllib_parse.urlencode({'password': password,
                                               'token': token})