Imported Upstream version 2016.02.22

[youtubedl] / youtube_dl / extractor / ellentv.py

diff --git a/youtube_dl/extractor/ellentv.py b/youtube_dl/extractor/ellentv.py
index 02c6a4615c4436fecda86fb152a131f084640612..4c8190d68d712bf702b5e015c95bbdda4643cefd 100644 (file)
--- a/youtube_dl/extractor/ellentv.py
+++ b/youtube_dl/extractor/ellentv.py
@@ -13,12 +13,12 @@ class EllenTVIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?(?:ellentv|ellentube)\.com/videos/(?P<id>[a-z0-9_-]+)'
     _TEST = {
         'url': 'http://www.ellentv.com/videos/0-ipq1gsai/',
     _VALID_URL = r'https?://(?:www\.)?(?:ellentv|ellentube)\.com/videos/(?P<id>[a-z0-9_-]+)'
     _TEST = {
         'url': 'http://www.ellentv.com/videos/0-ipq1gsai/',

-        'md5': '8e3c576bf2e9bfff4d76565f56f94c9c',
+        'md5': '4294cf98bc165f218aaa0b89e0fd8042',

         'info_dict': {
             'id': '0_ipq1gsai',
         'info_dict': {
             'id': '0_ipq1gsai',

-            'ext': 'mp4',
+            'ext': 'mov',

             'title': 'Fast Fingers of Fate',
             'title': 'Fast Fingers of Fate',

-            'description': 'md5:587e79fbbd0d73b148bc596d99ce48e6',
+            'description': 'md5:3539013ddcbfa64b2a6d1b38d910868a',

             'timestamp': 1428035648,
             'upload_date': '20150403',
             'uploader_id': 'batchUser',
             'timestamp': 1428035648,
             'upload_date': '20150403',
             'uploader_id': 'batchUser',


@@ -72,7 +72,7 @@ class EllenTVClipsIE(InfoExtractor):
     def _extract_playlist(self, webpage):
         json_string = self._search_regex(r'playerView.addClips\(\[\{(.*?)\}\]\);', webpage, 'json')
         try:
     def _extract_playlist(self, webpage):
         json_string = self._search_regex(r'playerView.addClips\(\[\{(.*?)\}\]\);', webpage, 'json')
         try:

-            return json.loads("[{" + json_string + "}]")
+            return json.loads('[{' + json_string + '}]')

         except ValueError as ve:
             raise ExtractorError('Failed to download JSON', cause=ve)
 
         except ValueError as ve:
             raise ExtractorError('Failed to download JSON', cause=ve)