diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2015-02-19 00:01:14 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2015-02-19 00:01:14 +0100 |
| commit | d61aefb24c96d8b45aed63cfdcfec0c157a24ba5 (patch) | |
| tree | c183b38e7a5ca723d623269f2f1f2d7fff7d354f | |
| parent | d305dd73a3d6927f0a2c63d08662a183fa173833 (diff) | |
| parent | 93a16ba238c25392ed66aa0f1d7cbd3980c45f2f (diff) | |
| download | youtube-dl-d61aefb24c96d8b45aed63cfdcfec0c157a24ba5.tar.gz youtube-dl-d61aefb24c96d8b45aed63cfdcfec0c157a24ba5.tar.xz youtube-dl-d61aefb24c96d8b45aed63cfdcfec0c157a24ba5.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | youtube_dl/extractor/vimeo.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/vimeo.py b/youtube_dl/extractor/vimeo.py index e7284049d..78d287e0e 100644 --- a/youtube_dl/extractor/vimeo.py +++ b/youtube_dl/extractor/vimeo.py @@ -175,7 +175,7 @@ class VimeoIE(VimeoBaseInfoExtractor, SubtitlesInfoExtractor): def _verify_video_password(self, url, video_id, webpage): password = self._downloader.params.get('videopassword', None) if password is None: - raise ExtractorError('This video is protected by a password, use the --video-password option') + raise ExtractorError('This video is protected by a password, use the --video-password option', expected=True) token = self._search_regex(r'xsrft: \'(.*?)\'', webpage, 'login token') data = compat_urllib_parse.urlencode({ 'password': password, |