debian/copyright: Update my copyright years.

[youtubedl] / youtube_dl / extractor / metacafe.py

diff --git a/youtube_dl/extractor/metacafe.py b/youtube_dl/extractor/metacafe.py
index 1a896b536dd813a561cea8f870258bf73519e00b..8bc333b0277e27e6fd8f3d4f11b3c9c7eabdd7d7 100644 (file)
--- a/youtube_dl/extractor/metacafe.py
+++ b/youtube_dl/extractor/metacafe.py
@@ -3,10 +3,12 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
 import re
 
 from .common import InfoExtractor

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

     compat_parse_qs,
     compat_urllib_parse,
     compat_urllib_request,
     compat_parse_qs,
     compat_urllib_parse,
     compat_urllib_request,

+)
+from ..utils import (

     determine_ext,
     ExtractorError,
     int_or_none,
     determine_ext,
     ExtractorError,
     int_or_none,


@@ -22,7 +24,7 @@ class MetacafeIE(InfoExtractor):
         # Youtube video
         {
             'add_ie': ['Youtube'],
         # Youtube video
         {
             'add_ie': ['Youtube'],

-            'url':  'http://metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/',
+            'url': 'http://metacafe.com/watch/yt-_aUehQsCQtM/the_electric_company_short_i_pbs_kids_go/',

             'info_dict': {
                 'id': '_aUehQsCQtM',
                 'ext': 'mp4',
             'info_dict': {
                 'id': '_aUehQsCQtM',
                 'ext': 'mp4',


@@ -219,8 +221,8 @@ class MetacafeIE(InfoExtractor):
         description = self._og_search_description(webpage)
         thumbnail = self._og_search_thumbnail(webpage)
         video_uploader = self._html_search_regex(
         description = self._og_search_description(webpage)
         thumbnail = self._og_search_thumbnail(webpage)
         video_uploader = self._html_search_regex(

-                r'submitter=(.*?);|googletag\.pubads\(\)\.setTargeting\("(?:channel|submiter)","([^"]+)"\);',
-                webpage, 'uploader nickname', fatal=False)
+            r'submitter=(.*?);|googletag\.pubads\(\)\.setTargeting\("(?:channel|submiter)","([^"]+)"\);',
+            webpage, 'uploader nickname', fatal=False)

         duration = int_or_none(
             self._html_search_meta('video:duration', webpage))
 
         duration = int_or_none(
             self._html_search_meta('video:duration', webpage))