Initiate a new release.

[youtubedl] / youtube_dl / extractor / vimeo.py

diff --git a/youtube_dl/extractor/vimeo.py b/youtube_dl/extractor/vimeo.py
index d9cad0ea521014843e98ec89b988cd54cecf67c0..1bb47351435bd48832671b84038b6c4a749cdfbc 100644 (file)
--- a/youtube_dl/extractor/vimeo.py
+++ b/youtube_dl/extractor/vimeo.py
@@ -7,11 +7,13 @@ import itertools
 
 from .common import InfoExtractor
 from .subtitles import SubtitlesInfoExtractor
 
 from .common import InfoExtractor
 from .subtitles import SubtitlesInfoExtractor

-from ..utils import (
+from ..compat import (

     compat_HTTPError,
     compat_urllib_parse,
     compat_urllib_request,
     compat_urlparse,
     compat_HTTPError,
     compat_urllib_parse,
     compat_urllib_request,
     compat_urlparse,

+)
+from ..utils import (

     ExtractorError,
     InAdvancePagedList,
     int_or_none,
     ExtractorError,
     InAdvancePagedList,
     int_or_none,


@@ -258,7 +260,7 @@ class VimeoIE(VimeoBaseInfoExtractor, SubtitlesInfoExtractor):
                 else:
                     config_re = [r' = {config:({.+?}),assets:', r'(?:[abc])=({.+?});']
                 config = self._search_regex(config_re, webpage, 'info section',
                 else:
                     config_re = [r' = {config:({.+?}),assets:', r'(?:[abc])=({.+?});']
                 config = self._search_regex(config_re, webpage, 'info section',

-                    flags=re.DOTALL)
+                                            flags=re.DOTALL)

                 config = json.loads(config)
         except Exception as e:
             if re.search('The creator of this video has not given you permission to embed it on this domain.', webpage):
                 config = json.loads(config)
         except Exception as e:
             if re.search('The creator of this video has not given you permission to embed it on this domain.', webpage):


@@ -499,9 +501,10 @@ class VimeoReviewIE(InfoExtractor):
     _VALID_URL = r'https?://vimeo\.com/[^/]+/review/(?P<id>[^/]+)'
     _TESTS = [{
         'url': 'https://vimeo.com/user21297594/review/75524534/3c257a1b5d',
     _VALID_URL = r'https?://vimeo\.com/[^/]+/review/(?P<id>[^/]+)'
     _TESTS = [{
         'url': 'https://vimeo.com/user21297594/review/75524534/3c257a1b5d',

-        'file': '75524534.mp4',

         'md5': 'c507a72f780cacc12b2248bb4006d253',
         'info_dict': {
         'md5': 'c507a72f780cacc12b2248bb4006d253',
         'info_dict': {

+            'id': '75524534',
+            'ext': 'mp4',

             'title': "DICK HARDWICK 'Comedian'",
             'uploader': 'Richard Hardwick',
         }
             'title': "DICK HARDWICK 'Comedian'",
             'uploader': 'Richard Hardwick',
         }