Imported Upstream version 2014.12.01

[youtubedl] / youtube_dl / extractor / nhl.py

diff --git a/youtube_dl/extractor/nhl.py b/youtube_dl/extractor/nhl.py
index 82af6e33098eaa9018c6f58b93b4e8b4c9cff399..bdcf7e23953870e61a523a11b4daaf10cfc3ab75 100644 (file)
--- a/youtube_dl/extractor/nhl.py
+++ b/youtube_dl/extractor/nhl.py
@@ -4,9 +4,11 @@ import re
 import json
 
 from .common import InfoExtractor
 import json
 
 from .common import InfoExtractor

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

     compat_urlparse,
     compat_urllib_parse,
     compat_urlparse,
     compat_urllib_parse,

+)
+from ..utils import (

     unified_strdate,
 )
 
     unified_strdate,
 )
 


@@ -31,7 +33,7 @@ class NHLBaseInfoExtractor(InfoExtractor):
                 path_url, video_id, 'Downloading final video url')
             video_url = path_doc.find('path').text
         else:
                 path_url, video_id, 'Downloading final video url')
             video_url = path_doc.find('path').text
         else:

-           video_url = initial_video_url
+            video_url = initial_video_url

 
         join = compat_urlparse.urljoin
         return {
 
         join = compat_urlparse.urljoin
         return {


@@ -122,10 +124,10 @@ class NHLVideocenterIE(NHLBaseInfoExtractor):
         response = self._download_webpage(request_url, playlist_title)
         response = self._fix_json(response)
         if not response.strip():
         response = self._download_webpage(request_url, playlist_title)
         response = self._fix_json(response)
         if not response.strip():

-            self._downloader.report_warning(u'Got an empty reponse, trying '
+            self._downloader.report_warning('Got an empty reponse, trying '

                                             'adding the "newvideos" parameter')
             response = self._download_webpage(request_url + '&newvideos=true',
                                             'adding the "newvideos" parameter')
             response = self._download_webpage(request_url + '&newvideos=true',

-                playlist_title)
+                                              playlist_title)

             response = self._fix_json(response)
         videos = json.loads(response)
 
             response = self._fix_json(response)
         videos = json.loads(response)