Merge tag 'upstream/2015.05.15'

[youtubedl] / youtube_dl / extractor / sockshare.py

diff --git a/youtube_dl/extractor/sockshare.py b/youtube_dl/extractor/sockshare.py
index 7d3c0e93783afeac3d8e939e0cf317177df4ca9f..b5fa6f1da203c993873622a9ee80c923300eebb2 100644 (file)
--- a/youtube_dl/extractor/sockshare.py
+++ b/youtube_dl/extractor/sockshare.py
@@ -25,7 +25,6 @@ class SockshareIE(InfoExtractor):
             'id': '437BE28B89D799D7',
             'title': 'big_buck_bunny_720p_surround.avi',
             'ext': 'avi',
             'id': '437BE28B89D799D7',
             'title': 'big_buck_bunny_720p_surround.avi',
             'ext': 'avi',

-            'thumbnail': 're:^http://.*\.jpg$',

         }
     }
 
         }
     }
 


@@ -45,7 +44,7 @@ class SockshareIE(InfoExtractor):
             ''', webpage, 'hash')
 
         fields = {
             ''', webpage, 'hash')
 
         fields = {

-            "hash": confirm_hash,
+            "hash": confirm_hash.encode('utf-8'),

             "confirm": "Continue as Free User"
         }
 
             "confirm": "Continue as Free User"
         }
 


@@ -68,7 +67,7 @@ class SockshareIE(InfoExtractor):
             webpage, 'title', default=None)
         thumbnail = self._html_search_regex(
             r'<img\s+src="([^"]*)".+?name="bg"',
             webpage, 'title', default=None)
         thumbnail = self._html_search_regex(
             r'<img\s+src="([^"]*)".+?name="bg"',

-            webpage, 'thumbnail')
+            webpage, 'thumbnail', default=None)

 
         formats = [{
             'format_id': 'sd',
 
         formats = [{
             'format_id': 'sd',